add workflow_id to sysargv for play step if it isn't there

cylc/flow/option_parsers.py

@@ -20,7 +20,6 @@
 from itertools import product
 from optparse import (
     OptionParser,
-    OptionConflictError,
     Values,
     Option,
     IndentedHelpFormatter
@@ -689,7 +688,8 @@ def combine_options_pair(first_list, second_list):
           `command-B has an option `-f` or `--fortran`` then
           `command-A+B` will have options `--fortran` and `--file` but _not_
           `-f`, which would be confusing.
-        - Arguments only apply to a single component of the compound CLI script.
+        - Arguments only apply to a single component of the compound CLI
+          script.
 
     """
     output = []
@@ -814,6 +814,7 @@ def cleanup_sysargv(
     # replace source path with workflow ID.
     if str(source) in sys.argv:
         sys.argv.remove(str(source))
+    if workflow_id not in sys.argv:
         sys.argv.append(workflow_id)
 
 

tests/unit/test_option_parsers.py

@@ -382,6 +382,21 @@ def test_combine_options(inputs, expect):
             'play --foo something myworkflow'.split(),
             id='replace path'
         ),
+        param(
+            'vip --foo something'.split(),
+            {
+                'script_name': 'play',
+                'workflow_id': 'myworkflow',
+                'compound_script_opts': [
+                    OptionSettings(['--foo', '-f'])],
+                'script_opts': [
+                    OptionSettings(['--foo', '-f']),
+                ],
+                'source': './myworkflow',
+            },
+            'play --foo something myworkflow'.split(),
+            id='no path given'
+        ),
     ]
 )
 def test_cleanup_sysargv(monkeypatch, argv_before, kwargs, expect):
@@ -510,4 +525,4 @@ def test__in_list():
         first = OptionSettings(['--foo'])
         second = OptionSettings(['--foo'])
         third = OptionSettings(['--bar'])
-        assert first._in_list([second, third]) == True
+        assert first._in_list([second, third]) is True