Jürg Billeter pushed to branch master at BuildStream / buildstream
Commits:
-
6047a575
by Tristan Van Berkom at 2018-08-28T13:41:36Z
-
7535fda8
by Jürg Billeter at 2018-08-28T14:25:35Z
1 changed file:
Changes:
... | ... | @@ -783,14 +783,14 @@ def test_inconsitent_pipeline_message(cli, tmpdir, datafiles, kind): |
783 | 783 |
|
784 | 784 |
|
785 | 785 |
@pytest.mark.datafiles(DATA_DIR)
|
786 |
-@pytest.mark.parametrize("kind", repo_kinds)
|
|
787 | 786 |
@pytest.mark.parametrize("strict", [("strict"), ("non-strict")])
|
788 |
-def test_cache_key_workspace_in_dependencies(cli, tmpdir, datafiles, kind, strict):
|
|
787 |
+def test_cache_key_workspace_in_dependencies(cli, tmpdir, datafiles, strict):
|
|
789 | 788 |
checkout = os.path.join(str(tmpdir), 'checkout')
|
790 |
- element_name, project, workspace = open_workspace(cli, os.path.join(str(tmpdir), 'repo-a'), datafiles, kind, False)
|
|
789 |
+ element_name, project, workspace = open_workspace(cli, os.path.join(str(tmpdir), 'repo-a'),
|
|
790 |
+ datafiles, 'git', False)
|
|
791 | 791 |
|
792 | 792 |
element_path = os.path.join(project, 'elements')
|
793 |
- back_dep_element_name = 'workspace-test-{}-back-dep.bst'.format(kind)
|
|
793 |
+ back_dep_element_name = 'workspace-test-back-dep.bst'
|
|
794 | 794 |
|
795 | 795 |
# Write out our test target
|
796 | 796 |
element = {
|