diff options
Diffstat (limited to 'tests/frontend')
| -rw-r--r-- | tests/frontend/buildcheckout.py | 2 | ||||
| -rw-r--r-- | tests/frontend/logging.py | 2 | ||||
| -rw-r--r-- | tests/frontend/rebuild.py | 2 | ||||
| -rw-r--r-- | tests/frontend/show.py | 4 | ||||
| -rw-r--r-- | tests/frontend/source_checkout.py | 2 | ||||
| -rw-r--r-- | tests/frontend/workspace.py | 16 |
6 files changed, 14 insertions, 14 deletions
diff --git a/tests/frontend/buildcheckout.py b/tests/frontend/buildcheckout.py index e7f67fa91..af34e6d67 100644 --- a/tests/frontend/buildcheckout.py +++ b/tests/frontend/buildcheckout.py @@ -21,7 +21,7 @@ DATA_DIR = os.path.join( def strict_args(args, strict): if strict != "strict": - return ['--no-strict'] + args + return ['--no-strict', *args] return args diff --git a/tests/frontend/logging.py b/tests/frontend/logging.py index 17d925cd1..58ac4eeba 100644 --- a/tests/frontend/logging.py +++ b/tests/frontend/logging.py @@ -101,7 +101,7 @@ def test_failed_build_listing(cli, tmpdir, datafiles): } _yaml.dump(element, os.path.join(project, element_path)) element_names.append(element_name) - result = cli.run(project=project, args=['--on-error=continue', 'build'] + element_names) + result = cli.run(project=project, args=['--on-error=continue', 'build', *element_names]) result.assert_main_error(ErrorDomain.STREAM, None) failure_heading_pos = re.search(r'^Failure Summary$', result.stderr, re.MULTILINE).start() diff --git a/tests/frontend/rebuild.py b/tests/frontend/rebuild.py index 6a46e855e..21f21fae3 100644 --- a/tests/frontend/rebuild.py +++ b/tests/frontend/rebuild.py @@ -11,7 +11,7 @@ DATA_DIR = os.path.join( def strict_args(args, strict): if strict != "strict": - return ['--no-strict'] + args + return ['--no-strict', *args] return args diff --git a/tests/frontend/show.py b/tests/frontend/show.py index ac1edebd6..73cda9108 100644 --- a/tests/frontend/show.py +++ b/tests/frontend/show.py @@ -181,7 +181,7 @@ def test_parallel_order(cli, tmpdir, datafiles): elements = ['multiple_targets/order/0.bst', 'multiple_targets/order/1.bst'] - args = ['show', '-d', 'plan', '-f', '%{name}'] + elements + args = ['show', '-d', 'plan', '-f', '%{name}', *elements] result = cli.run(project=project, args=args) result.assert_success() @@ -210,7 +210,7 @@ def test_target_is_dependency(cli, tmpdir, datafiles): elements = ['multiple_targets/dependency/zebry.bst', 'multiple_targets/dependency/horsey.bst'] - args = ['show', '-d', 'plan', '-f', '%{name}'] + elements + args = ['show', '-d', 'plan', '-f', '%{name}', *elements] result = cli.run(project=project, args=args) result.assert_success() diff --git a/tests/frontend/source_checkout.py b/tests/frontend/source_checkout.py index b41d32491..1a83ba76e 100644 --- a/tests/frontend/source_checkout.py +++ b/tests/frontend/source_checkout.py @@ -50,7 +50,7 @@ def test_source_checkout(datafiles, cli, tmpdir_factory, with_workspace, guess_e else: ws_cmd = [] - args = ws_cmd + ['source', 'checkout', '--deps', 'none'] + elm_cmd + [checkout] + args = ws_cmd + ['source', 'checkout', '--deps', 'none', *elm_cmd, checkout] result = cli.run(project=project, args=args) result.assert_success() diff --git a/tests/frontend/workspace.py b/tests/frontend/workspace.py index 91004b9f4..7ca8064b8 100644 --- a/tests/frontend/workspace.py +++ b/tests/frontend/workspace.py @@ -657,14 +657,14 @@ def test_build(cli, tmpdir_factory, datafiles, kind, strict, from_workspace, gue # Build modified workspace assert cli.get_element_state(project, element_name) == 'buildable' assert cli.get_element_key(project, element_name) == "{:?<64}".format('') - result = cli.run(project=project, args=args_dir + ['build'] + args_elm) + result = cli.run(project=project, args=args_dir + ['build', *args_elm]) result.assert_success() assert cli.get_element_state(project, element_name) == 'cached' assert cli.get_element_key(project, element_name) != "{:?<64}".format('') # Checkout the result result = cli.run(project=project, - args=args_dir + ['artifact', 'checkout', '--directory', checkout] + args_elm) + args=args_dir + ['artifact', 'checkout', '--directory', checkout, *args_elm]) result.assert_success() # Check that the pony.conf from the modified workspace exists @@ -1101,7 +1101,7 @@ def test_external_fetch(cli, datafiles, tmpdir_factory, subdir, guess_element): assert cli.get_element_state(str(datafiles), depend_element) == 'fetch needed' # Fetch the workspaced element - result = cli.run(project=project, args=['-C', call_dir, 'source', 'fetch'] + arg_elm) + result = cli.run(project=project, args=['-C', call_dir, 'source', 'fetch', *arg_elm]) result.assert_success() # Assert that the depended element has now been fetched @@ -1124,10 +1124,10 @@ def test_external_push_pull(cli, datafiles, tmpdir_factory, guess_element): 'artifacts': {'url': share.repo, 'push': True} }) - result = cli.run(project=project, args=['-C', workspace, 'artifact', 'push'] + arg_elm) + result = cli.run(project=project, args=['-C', workspace, 'artifact', 'push', *arg_elm]) result.assert_success() - result = cli.run(project=project, args=['-C', workspace, 'artifact', 'pull', '--deps', 'all'] + arg_elm) + result = cli.run(project=project, args=['-C', workspace, 'artifact', 'pull', '--deps', 'all', *arg_elm]) result.assert_success() @@ -1145,7 +1145,7 @@ def test_external_track(cli, datafiles, tmpdir_factory, guess_element): del element_contents['sources'][0]['ref'] _yaml.dump(_yaml.node_sanitize(element_contents), element_file) - result = cli.run(project=project, args=['-C', workspace, 'source', 'track'] + arg_elm) + result = cli.run(project=project, args=['-C', workspace, 'source', 'track', *arg_elm]) result.assert_success() # Element is tracked now @@ -1198,7 +1198,7 @@ def test_external_close_self(cli, datafiles, tmpdir_factory, guess_element): beta_element, _, beta_workspace = open_workspace(cli, tmpdir2, datafiles, "git", False, suffix="-beta") arg_elm = [alpha_element] if not guess_element else [] - result = cli.run(project=project, args=['-C', alpha_workspace, 'workspace', 'close'] + arg_elm) + result = cli.run(project=project, args=['-C', alpha_workspace, 'workspace', 'close', *arg_elm]) result.assert_success() assert 'you can no longer run BuildStream' in result.stderr @@ -1222,7 +1222,7 @@ def test_external_reset_self(cli, datafiles, tmpdir, guess_element): arg_elm = [element] if not guess_element else [] # Command succeeds - result = cli.run(project=project, args=['-C', workspace, 'workspace', 'reset'] + arg_elm) + result = cli.run(project=project, args=['-C', workspace, 'workspace', 'reset', *arg_elm]) result.assert_success() # Successive commands still work (i.e. .bstproject.yaml hasn't been deleted) |