diff options
author | Jürg Billeter <j@bitron.ch> | 2018-08-28 14:25:35 +0000 |
---|---|---|
committer | Jürg Billeter <j@bitron.ch> | 2018-08-28 14:25:35 +0000 |
commit | 7535fda8b3207a6020be3e7aee3337cda7dc6d56 (patch) | |
tree | 1d439e255571b5c38bde948b0444af6095779d09 | |
parent | 6a5a8e7a9942c83581d3cb44e6509f773ca136f9 (diff) | |
parent | 6047a575525985dc0756ba82073772634b0993d6 (diff) | |
download | buildstream-7535fda8b3207a6020be3e7aee3337cda7dc6d56.tar.gz |
Merge branch 'tristan/remove-redundant-test' into 'master'
tests/frontend/workspaces.py: Removing some redundant tests
See merge request BuildStream/buildstream!741
-rw-r--r-- | tests/frontend/workspace.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/frontend/workspace.py b/tests/frontend/workspace.py index a6dd54648..86cb3952d 100644 --- a/tests/frontend/workspace.py +++ b/tests/frontend/workspace.py @@ -783,14 +783,14 @@ def test_inconsitent_pipeline_message(cli, tmpdir, datafiles, kind): @pytest.mark.datafiles(DATA_DIR) -@pytest.mark.parametrize("kind", repo_kinds) @pytest.mark.parametrize("strict", [("strict"), ("non-strict")]) -def test_cache_key_workspace_in_dependencies(cli, tmpdir, datafiles, kind, strict): +def test_cache_key_workspace_in_dependencies(cli, tmpdir, datafiles, strict): checkout = os.path.join(str(tmpdir), 'checkout') - element_name, project, workspace = open_workspace(cli, os.path.join(str(tmpdir), 'repo-a'), datafiles, kind, False) + element_name, project, workspace = open_workspace(cli, os.path.join(str(tmpdir), 'repo-a'), + datafiles, 'git', False) element_path = os.path.join(project, 'elements') - back_dep_element_name = 'workspace-test-{}-back-dep.bst'.format(kind) + back_dep_element_name = 'workspace-test-back-dep.bst' # Write out our test target element = { |