test fix

cylc · Oct 21, 2022 · f30a524 · f30a524
1 parent 61c27b5
commit f30a524
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/cylc/flow/option_parsers.py b/cylc/flow/option_parsers.py
@@ -784,7 +784,8 @@ def cleanup_sysargv(
 
     # replace compound script name:
     sys.argv[1] = script_name
-    sys.argv.append(workflow_id)
+    if workflow_id not in sys.argv:
+        sys.argv.append(workflow_id)
 
 
 def log_subcommand(command, workflow_id):

diff --git a/cylc/flow/scripts/validate_install_play.py b/cylc/flow/scripts/validate_install_play.py
@@ -55,8 +55,8 @@
 
 CYLC_ROSE_OPTIONS = COP.get_cylc_rose_options()
 VIP_OPTIONS = combine_options(
-    VALIDATE_OPTIONS, INSTALL_OPTIONS,
-    PLAY_OPTIONS, CYLC_ROSE_OPTIONS
+    ('v', VALIDATE_OPTIONS), ('i', INSTALL_OPTIONS),
+    ('p', PLAY_OPTIONS), ('cr', CYLC_ROSE_OPTIONS)
 )
 
 

diff --git a/tests/unit/test_option_parsers.py b/tests/unit/test_option_parsers.py
@@ -223,6 +223,7 @@ def test_combine_options(inputs, expect):
             'vip myworkflow'.split(),
             {
                 'script_name': 'play',
+                'workflow_id': 'myworkflow',
                 'compound_script_opts': [
                     {ARGS: ['--foo', '-f'], KWARGS: {}},
                 ],
@@ -238,6 +239,7 @@ def test_combine_options(inputs, expect):
             'vip myworkflow'.split(),
             {
                 'script_name': 'play',
+                'workflow_id': 'myworkflow',
                 'compound_script_opts': [
                     {ARGS: ['--foo', '-f'], KWARGS: {}},
                     {ARGS: ['--bar', '-b'], KWARGS: {}},
@@ -255,6 +257,7 @@ def test_combine_options(inputs, expect):
             'vip myworkflow'.split(),
             {
                 'script_name': 'play',
+                'workflow_id': 'myworkflow',
                 'compound_script_opts': [
                     {ARGS: ['--foo', '-f'], KWARGS: {}},
                     {ARGS: ['--bar', '-b'], KWARGS: {}},