fix input/output options in basic_submit arguments

WIPACrepo · Oct 17, 2024 · 3844711 · 3844711
1 parent c7da7ff
commit 3844711
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/iceprod/core/exe.py b/iceprod/core/exe.py
@@ -152,12 +152,16 @@ def scope_env(cfg: ConfigParser, obj: dict, upperenv: Optional[Env] = None, logg
         'parameters': {},
         'input_files': set(),
         'output_files': set(),
+        'upper_input_files': set(),
+        'upper_output_files': set(),
         'environment': {
             'OS_ARCH': '$OS_ARCH',
         }
     }
     if upperenv:
         env['parameters'].update(upperenv['parameters'])
+        env['upper_input_files'] = upperenv['input_files'] | upperenv['upper_input_files']
+        env['upper_output_files'] = upperenv['output_files'] | upperenv['upper_output_files']
 
     logger = logger if logger else logging.getLogger()
 
@@ -185,6 +189,12 @@ def scope_env(cfg: ConfigParser, obj: dict, upperenv: Optional[Env] = None, logg
                     if ret:
                         env['output_files'].add(ret)
 
+        # add input and output to parseable options
+        cfg.config['options']['input'] = ' '.join(d.local for d in (env['input_files'] | env['upper_input_files']))
+        cfg.config['options']['output'] = ' '.join(d.local for d in (env['output_files'] | env['upper_output_files']))
+        logging.info('input: %r', cfg.config['options']['input'])
+        logging.info('output: %r', cfg.config['options']['output'])
+
     except util.NoncriticalError:
         logger.warning('Noncritical error when setting up environment', exc_info=True)
     except Exception:

diff --git a/tests/core/exe_test.py b/tests/core/exe_test.py
@@ -538,7 +538,8 @@ async def test_write_to_script_data_task_files(tmp_path):
             'trays': [{
                 'modules': [{
                     'env_clear': False,
-                    'src': 'foo.py'
+                    'src': 'foo.py',
+                    'args': '--foo -b $(input) $(output)',
                 }]
             }],
             'data': [{
@@ -572,6 +573,8 @@ async def test_write_to_script_data_task_files(tmp_path):
     assert ws.infiles == {Data('https://foo.bar/baz', 'baz', Transfer.TRUE), Data('https://foo.bar/blah', 'blah', Transfer.TRUE)}
     assert ws.outfiles == {Data('https://foo.bar/1234', '1234', Transfer.TRUE), Data('https://foo.bar/abcde', 'abcde', Transfer.TRUE)}
     script = open(scriptpath).read()
+    lines = [line for line in script.split('\n') if not (not line.strip() or line.startswith('#') or line.startswith('set '))]
+    assert lines[-1] == 'python foo.py --foo -b baz blah 1234 abcde'
 
 
 async def test_write_to_script_data_dups(tmp_path):