diff options
| author | William Salmon <will.salmon@codethink.co.uk> | 2018-11-02 15:49:12 +0000 |
|---|---|---|
| committer | Will Salmon <will.salmon@codethink.co.uk> | 2018-11-21 15:53:03 +0000 |
| commit | 7bdd44b2000b9ba3fb5742c2d03b7ebe99b0a196 (patch) | |
| tree | 70e780f81ff24c206efdb21961be9718c048793c /tests/integration/workspace.py | |
| parent | 2022c3e8419656ca9c0faac17bb7a2041eaf5aca (diff) | |
| download | buildstream-7bdd44b2000b9ba3fb5742c2d03b7ebe99b0a196.tar.gz | |
Workspace CLI update
This is to update the workspace CLI to as agreed on the mailing list
https://mail.gnome.org/archives/buildstream-list/2018-September/msg00046.html
This patch also introduces the default workspace directory.
Diffstat (limited to 'tests/integration/workspace.py')
| -rw-r--r-- | tests/integration/workspace.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/integration/workspace.py b/tests/integration/workspace.py index e4f80ca74..0aeb4a3b2 100644 --- a/tests/integration/workspace.py +++ b/tests/integration/workspace.py @@ -24,7 +24,7 @@ def test_workspace_mount(cli, tmpdir, datafiles): workspace = os.path.join(cli.directory, 'workspace') element_name = 'workspace/workspace-mount.bst' - res = cli.run(project=project, args=['workspace', 'open', element_name, workspace]) + res = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, element_name]) assert res.exit_code == 0 res = cli.run(project=project, args=['build', element_name]) @@ -41,7 +41,7 @@ def test_workspace_commanddir(cli, tmpdir, datafiles): workspace = os.path.join(cli.directory, 'workspace') element_name = 'workspace/workspace-commanddir.bst' - res = cli.run(project=project, args=['workspace', 'open', element_name, workspace]) + res = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, element_name]) assert res.exit_code == 0 res = cli.run(project=project, args=['build', element_name]) @@ -78,7 +78,7 @@ def test_workspace_updated_dependency(cli, tmpdir, datafiles): _yaml.dump(dependency, os.path.join(element_path, dep_name)) # First open the workspace - res = cli.run(project=project, args=['workspace', 'open', element_name, workspace]) + res = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, element_name]) assert res.exit_code == 0 # We build the workspaced element, so that we have an artifact @@ -134,7 +134,7 @@ def test_workspace_update_dependency_failed(cli, tmpdir, datafiles): _yaml.dump(dependency, os.path.join(element_path, dep_name)) # First open the workspace - res = cli.run(project=project, args=['workspace', 'open', element_name, workspace]) + res = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, element_name]) assert res.exit_code == 0 # We build the workspaced element, so that we have an artifact @@ -210,7 +210,7 @@ def test_updated_dependency_nested(cli, tmpdir, datafiles): _yaml.dump(dependency, os.path.join(element_path, dep_name)) # First open the workspace - res = cli.run(project=project, args=['workspace', 'open', element_name, workspace]) + res = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, element_name]) assert res.exit_code == 0 # We build the workspaced element, so that we have an artifact @@ -264,7 +264,7 @@ def test_incremental_configure_commands_run_only_once(cli, tmpdir, datafiles): _yaml.dump(element, os.path.join(element_path, element_name)) # We open a workspace on the above element - res = cli.run(project=project, args=['workspace', 'open', element_name, workspace]) + res = cli.run(project=project, args=['workspace', 'open', '--directory', workspace, element_name]) res.assert_success() # Then we build, and check whether the configure step succeeded |