This is an automated email from the ASF dual-hosted git repository. tvb pushed a commit to branch tristan/remove-plugins in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 28add6da553be70900e01f2e582124d2cbd87dbe Author: Tristan van Berkom <[email protected]> AuthorDate: Wed Mar 30 13:58:45 2022 +0900 tests/testutils/junction.py: Port generate_junction() to use tar repo instead of git repo --- tests/format/include.py | 6 ++++-- tests/testutils/junction.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/format/include.py b/tests/format/include.py index 3443cec..42f85c1 100644 --- a/tests/format/include.py +++ b/tests/format/include.py @@ -317,9 +317,11 @@ def test_option_from_junction_element(cli, tmpdir, datafiles): @pytest.mark.datafiles(DATA_DIR) def test_option_from_deep_junction(cli, tmpdir, datafiles): project = os.path.join(str(datafiles), "junction_options_deep") + junction_repo_a = os.path.join(tmpdir, "a") + junction_repo_b = os.path.join(tmpdir, "b") generate_junction( - tmpdir, + junction_repo_a, os.path.join(project, "subproject-2"), os.path.join(project, "subproject-1", "junction-2.bst"), store_ref=True, @@ -327,7 +329,7 @@ def test_option_from_deep_junction(cli, tmpdir, datafiles): ) generate_junction( - tmpdir, + junction_repo_b, os.path.join(project, "subproject-1"), os.path.join(project, "junction-1.bst"), store_ref=True, diff --git a/tests/testutils/junction.py b/tests/testutils/junction.py index 0a94846..4fc7de5 100644 --- a/tests/testutils/junction.py +++ b/tests/testutils/junction.py @@ -19,7 +19,7 @@ def generate_junction(tmpdir, subproject_path, junction_path, *, store_ref=True, # Create a repo to hold the subproject and generate # a junction element for it # - repo = create_repo("git", str(tmpdir)) + repo = create_repo("tar", str(tmpdir)) source_ref = ref = repo.create(subproject_path) if not store_ref: source_ref = None
