You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by tv...@apache.org on 2022/03/30 05:40:33 UTC
[buildstream] 03/37: tests/sources/bzr.py: Removing bzr specific tests
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 d1a074887535cb302af945bf6ab525abdb47c972
Author: Tristan van Berkom <tr...@codethink.co.uk>
AuthorDate: Mon Mar 28 16:09:21 2022 +0900
tests/sources/bzr.py: Removing bzr specific tests
---
tests/sources/bzr.py | 68 ------------------------------------------
tests/sources/bzr/basic/test | 1 -
tests/sources/bzr/project.conf | 3 --
3 files changed, 72 deletions(-)
diff --git a/tests/sources/bzr.py b/tests/sources/bzr.py
deleted file mode 100644
index a4f8f22..0000000
--- a/tests/sources/bzr.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Pylint doesn't play well with fixtures and dependency injection from pytest
-# pylint: disable=redefined-outer-name
-
-import os
-import subprocess
-
-import pytest
-
-from buildstream import _yaml
-from buildstream._testing import cli # pylint: disable=unused-import
-from buildstream._testing import create_repo
-from buildstream._testing import generate_element
-from buildstream._testing._utils.site import HAVE_BZR
-
-pytestmark = pytest.mark.skipif(HAVE_BZR is False, reason="bzr is not available")
-DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bzr")
-
-
-@pytest.mark.datafiles(os.path.join(DATA_DIR))
-def test_fetch_checkout(cli, tmpdir, datafiles):
- project = str(datafiles)
- checkoutdir = os.path.join(str(tmpdir), "checkout")
-
- repo = create_repo("bzr", str(tmpdir))
- ref = repo.create(os.path.join(project, "basic"))
-
- # Write out our test target
- element = {"kind": "import", "sources": [repo.source_config(ref=ref)]}
- generate_element(project, "target.bst", element)
-
- # Fetch, build, checkout
- result = cli.run(project=project, args=["source", "fetch", "target.bst"])
- assert result.exit_code == 0
- result = cli.run(project=project, args=["build", "target.bst"])
- assert result.exit_code == 0
- result = cli.run(project=project, args=["artifact", "checkout", "target.bst", "--directory", checkoutdir])
- assert result.exit_code == 0
-
- # Assert we checked out the file as it was commited
- with open(os.path.join(checkoutdir, "test"), encoding="utf-8") as f:
- text = f.read()
-
- assert text == "test\n"
-
-
-@pytest.mark.datafiles(DATA_DIR)
-def test_open_bzr_customize(cli, tmpdir, datafiles):
- project = str(datafiles)
- repo = create_repo("bzr", str(tmpdir))
- ref = repo.create(os.path.join(project, "basic"))
-
- element = {"kind": "import", "sources": [repo.source_config(ref=ref)]}
- generate_element(project, "target.bst", element)
-
- workspace = os.path.join(datafiles, "bzr-workspace")
- result = cli.run(cwd=project, project=project, args=["workspace", "open", "--directory", workspace, "target.bst"])
- result.assert_success()
-
- # Check that the .bzr dir exists
- assert os.path.isdir(os.path.join(workspace, ".bzr"))
-
- # Check that the correct origin branch is set
- element_config = _yaml.load(os.path.join(project, "target.bst"), shortname=None)
- source_config = element_config.get_sequence("sources").mapping_at(0)
- output = subprocess.check_output(["bzr", "info"], cwd=workspace)
- stripped_url = source_config.get_str("url").lstrip("file:///")
- expected_output_str = "checkout of branch: /{}/{}".format(stripped_url, source_config.get_str("track"))
- assert expected_output_str in str(output)
diff --git a/tests/sources/bzr/basic/test b/tests/sources/bzr/basic/test
deleted file mode 100644
index 9daeafb..0000000
--- a/tests/sources/bzr/basic/test
+++ /dev/null
@@ -1 +0,0 @@
-test
diff --git a/tests/sources/bzr/project.conf b/tests/sources/bzr/project.conf
deleted file mode 100644
index 08a9d60..0000000
--- a/tests/sources/bzr/project.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Basic Project
-name: foo
-min-version: 2.0