diff options
| author | Phil Dawson <phil.dawson@codethink.co.uk> | 2019-04-15 11:02:33 +0100 |
|---|---|---|
| committer | Phil Dawson <phil.dawson@codethink.co.uk> | 2019-04-16 14:25:40 +0100 |
| commit | 97bbedbef15fc9edea5b04f66a30ec788da7f130 (patch) | |
| tree | 109707eaf268fbf104e3ec2cdad337f2fde81c3d | |
| parent | 9d7d803bbefed364ad58b4b5b5305f4e210bb5e1 (diff) | |
| download | buildstream-phil/rename-plugintestutils.tar.gz | |
plugintestutils: Rename 'plugintestutils' package to 'testing'phil/rename-plugintestutils
- Rename plugintestutils to testing.
- Don't run the tests from bst-plugins-template. This imports
buildstream.plugintestutils so will have to be disabled to get
through CI. This can be re nabled once bst-plugins-template has been
patched.
159 files changed, 153 insertions, 159 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 4365f0df1..729a3e957 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,7 +7,7 @@ include NEWS include README.rst # Data files required by BuildStream's generic source tests -recursive-include buildstream/plugintestutils/_sourcetests/project * +recursive-include buildstream/testing/_sourcetests/project * # Documentation package includes include doc/Makefile diff --git a/buildstream/plugintestutils/__init__.py b/buildstream/testing/__init__.py index 19cb1bf9a..0dfc11f1c 100644 --- a/buildstream/plugintestutils/__init__.py +++ b/buildstream/testing/__init__.py @@ -69,7 +69,7 @@ def register_repo_kind(kind, cls): In addition, repo_kinds registred prior to `sourcetests_collection_hook` being called will be automatically used to test the basic behaviour of their associated source - plugins using the tests in `plugintestutils._sourcetests`. + plugins using the tests in `testing._sourcetests`. Args: kind (str): The kind of repo to create (a source plugin basename) diff --git a/buildstream/plugintestutils/_sourcetests/__init__.py b/buildstream/testing/_sourcetests/__init__.py index e69de29bb..e69de29bb 100644 --- a/buildstream/plugintestutils/_sourcetests/__init__.py +++ b/buildstream/testing/_sourcetests/__init__.py diff --git a/buildstream/plugintestutils/_sourcetests/build_checkout.py b/buildstream/testing/_sourcetests/build_checkout.py index 074be8429..3619d2b7e 100644 --- a/buildstream/plugintestutils/_sourcetests/build_checkout.py +++ b/buildstream/testing/_sourcetests/build_checkout.py @@ -22,8 +22,8 @@ import os import pytest -from buildstream.plugintestutils import create_repo, ALL_REPO_KINDS -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import create_repo, ALL_REPO_KINDS +from buildstream.testing import cli # pylint: disable=unused-import from buildstream import _yaml # Project directory diff --git a/buildstream/plugintestutils/_sourcetests/fetch.py b/buildstream/testing/_sourcetests/fetch.py index aaf92a14d..aaf92a14d 100644 --- a/buildstream/plugintestutils/_sourcetests/fetch.py +++ b/buildstream/testing/_sourcetests/fetch.py diff --git a/buildstream/plugintestutils/_sourcetests/mirror.py b/buildstream/testing/_sourcetests/mirror.py index d682bb2ef..d682bb2ef 100644 --- a/buildstream/plugintestutils/_sourcetests/mirror.py +++ b/buildstream/testing/_sourcetests/mirror.py diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/base.bst b/buildstream/testing/_sourcetests/project/elements/base.bst index 428afa736..428afa736 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/base.bst +++ b/buildstream/testing/_sourcetests/project/elements/base.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/base/base-alpine.bst b/buildstream/testing/_sourcetests/project/elements/base/base-alpine.bst index c5833095d..c5833095d 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/base/base-alpine.bst +++ b/buildstream/testing/_sourcetests/project/elements/base/base-alpine.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/import-bin.bst b/buildstream/testing/_sourcetests/project/elements/import-bin.bst index a847c0c23..a847c0c23 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/import-bin.bst +++ b/buildstream/testing/_sourcetests/project/elements/import-bin.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/import-dev.bst b/buildstream/testing/_sourcetests/project/elements/import-dev.bst index 152a54667..152a54667 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/import-dev.bst +++ b/buildstream/testing/_sourcetests/project/elements/import-dev.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/dependency/horsey.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/horsey.bst index bd1ffae9c..bd1ffae9c 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/dependency/horsey.bst +++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/horsey.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/dependency/pony.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/pony.bst index 3c29b4ea1..3c29b4ea1 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/dependency/pony.bst +++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/pony.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/dependency/zebry.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/zebry.bst index 98447ab52..98447ab52 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/dependency/zebry.bst +++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/zebry.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/0.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/0.bst index a99be06a0..a99be06a0 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/0.bst +++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/0.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/1.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/1.bst index 82b507a62..82b507a62 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/1.bst +++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/1.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/2.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/2.bst index ee1afae20..ee1afae20 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/2.bst +++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/2.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/3.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/3.bst index 4c3a23dab..4c3a23dab 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/3.bst +++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/3.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/4.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/4.bst index b663a0b52..b663a0b52 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/4.bst +++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/4.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/5.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/5.bst index b9efcf71b..b9efcf71b 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/5.bst +++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/5.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/6.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/6.bst index 6c19d04e3..6c19d04e3 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/6.bst +++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/6.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/7.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/7.bst index 6805b3e6d..6805b3e6d 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/7.bst +++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/7.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/8.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/8.bst index b8d8964a0..b8d8964a0 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/8.bst +++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/8.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/9.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/9.bst index cc13bf3f0..cc13bf3f0 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/9.bst +++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/9.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/run.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/run.bst index 9b3d2446c..9b3d2446c 100644 --- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/run.bst +++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/run.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/files/bar b/buildstream/testing/_sourcetests/project/files/bar index e69de29bb..e69de29bb 100644 --- a/buildstream/plugintestutils/_sourcetests/project/files/bar +++ b/buildstream/testing/_sourcetests/project/files/bar diff --git a/buildstream/plugintestutils/_sourcetests/project/files/bin-files/usr/bin/hello b/buildstream/testing/_sourcetests/project/files/bin-files/usr/bin/hello index f534a4083..f534a4083 100755 --- a/buildstream/plugintestutils/_sourcetests/project/files/bin-files/usr/bin/hello +++ b/buildstream/testing/_sourcetests/project/files/bin-files/usr/bin/hello diff --git a/buildstream/plugintestutils/_sourcetests/project/files/dev-files/usr/include/pony.h b/buildstream/testing/_sourcetests/project/files/dev-files/usr/include/pony.h index 40bd0c2e7..40bd0c2e7 100644 --- a/buildstream/plugintestutils/_sourcetests/project/files/dev-files/usr/include/pony.h +++ b/buildstream/testing/_sourcetests/project/files/dev-files/usr/include/pony.h diff --git a/buildstream/plugintestutils/_sourcetests/project/files/etc-files/etc/buildstream/config b/buildstream/testing/_sourcetests/project/files/etc-files/etc/buildstream/config index 04204c7c9..04204c7c9 100644 --- a/buildstream/plugintestutils/_sourcetests/project/files/etc-files/etc/buildstream/config +++ b/buildstream/testing/_sourcetests/project/files/etc-files/etc/buildstream/config diff --git a/buildstream/plugintestutils/_sourcetests/project/files/foo b/buildstream/testing/_sourcetests/project/files/foo index e69de29bb..e69de29bb 100644 --- a/buildstream/plugintestutils/_sourcetests/project/files/foo +++ b/buildstream/testing/_sourcetests/project/files/foo diff --git a/buildstream/plugintestutils/_sourcetests/project/files/source-bundle/llamas.txt b/buildstream/testing/_sourcetests/project/files/source-bundle/llamas.txt index f98b24871..f98b24871 100644 --- a/buildstream/plugintestutils/_sourcetests/project/files/source-bundle/llamas.txt +++ b/buildstream/testing/_sourcetests/project/files/source-bundle/llamas.txt diff --git a/buildstream/plugintestutils/_sourcetests/project/files/sub-project/elements/import-etc.bst b/buildstream/testing/_sourcetests/project/files/sub-project/elements/import-etc.bst index f0171990e..f0171990e 100644 --- a/buildstream/plugintestutils/_sourcetests/project/files/sub-project/elements/import-etc.bst +++ b/buildstream/testing/_sourcetests/project/files/sub-project/elements/import-etc.bst diff --git a/buildstream/plugintestutils/_sourcetests/project/files/sub-project/files/etc-files/etc/animal.conf b/buildstream/testing/_sourcetests/project/files/sub-project/files/etc-files/etc/animal.conf index db8c36cba..db8c36cba 100644 --- a/buildstream/plugintestutils/_sourcetests/project/files/sub-project/files/etc-files/etc/animal.conf +++ b/buildstream/testing/_sourcetests/project/files/sub-project/files/etc-files/etc/animal.conf diff --git a/buildstream/plugintestutils/_sourcetests/project/files/sub-project/project.conf b/buildstream/testing/_sourcetests/project/files/sub-project/project.conf index bbb8414a3..bbb8414a3 100644 --- a/buildstream/plugintestutils/_sourcetests/project/files/sub-project/project.conf +++ b/buildstream/testing/_sourcetests/project/files/sub-project/project.conf diff --git a/buildstream/plugintestutils/_sourcetests/project/project.conf b/buildstream/testing/_sourcetests/project/project.conf index 05b68bfeb..05b68bfeb 100644 --- a/buildstream/plugintestutils/_sourcetests/project/project.conf +++ b/buildstream/testing/_sourcetests/project/project.conf diff --git a/buildstream/plugintestutils/_sourcetests/source_determinism.py b/buildstream/testing/_sourcetests/source_determinism.py index 8597a7072..8597a7072 100644 --- a/buildstream/plugintestutils/_sourcetests/source_determinism.py +++ b/buildstream/testing/_sourcetests/source_determinism.py diff --git a/buildstream/plugintestutils/_sourcetests/track.py b/buildstream/testing/_sourcetests/track.py index 668ea29e5..668ea29e5 100644 --- a/buildstream/plugintestutils/_sourcetests/track.py +++ b/buildstream/testing/_sourcetests/track.py diff --git a/buildstream/plugintestutils/_sourcetests/track_cross_junction.py b/buildstream/testing/_sourcetests/track_cross_junction.py index ece3e0b8f..ece3e0b8f 100644 --- a/buildstream/plugintestutils/_sourcetests/track_cross_junction.py +++ b/buildstream/testing/_sourcetests/track_cross_junction.py diff --git a/buildstream/plugintestutils/_sourcetests/workspace.py b/buildstream/testing/_sourcetests/workspace.py index 5218f8f1e..5218f8f1e 100644 --- a/buildstream/plugintestutils/_sourcetests/workspace.py +++ b/buildstream/testing/_sourcetests/workspace.py diff --git a/buildstream/plugintestutils/_utils/__init__.py b/buildstream/testing/_utils/__init__.py index b419d72b7..b419d72b7 100644 --- a/buildstream/plugintestutils/_utils/__init__.py +++ b/buildstream/testing/_utils/__init__.py diff --git a/buildstream/plugintestutils/_utils/junction.py b/buildstream/testing/_utils/junction.py index ca059eb8b..ca059eb8b 100644 --- a/buildstream/plugintestutils/_utils/junction.py +++ b/buildstream/testing/_utils/junction.py diff --git a/buildstream/plugintestutils/_utils/site.py b/buildstream/testing/_utils/site.py index 54c5b467b..54c5b467b 100644 --- a/buildstream/plugintestutils/_utils/site.py +++ b/buildstream/testing/_utils/site.py diff --git a/buildstream/plugintestutils/integration.py b/buildstream/testing/integration.py index e29f480ea..e29f480ea 100644 --- a/buildstream/plugintestutils/integration.py +++ b/buildstream/testing/integration.py diff --git a/buildstream/plugintestutils/repo.py b/buildstream/testing/repo.py index e3293ea75..c1538685d 100644 --- a/buildstream/plugintestutils/repo.py +++ b/buildstream/testing/repo.py @@ -31,7 +31,7 @@ class Repo(): Abstract class providing scaffolding for generating data to be used with various sources. Subclasses of Repo may be registered to run through the suite of generic source plugin tests provided in - buildstream.plugintestutils. + buildstream.testing. Args: directory (str): The base temp directory for the test diff --git a/buildstream/plugintestutils/runcli.py b/buildstream/testing/runcli.py index 72bdce09e..72bdce09e 100644 --- a/buildstream/plugintestutils/runcli.py +++ b/buildstream/testing/runcli.py diff --git a/doc/source/core_framework.rst b/doc/source/core_framework.rst index 127b5b2c6..fe2a59c5c 100644 --- a/doc/source/core_framework.rst +++ b/doc/source/core_framework.rst @@ -20,4 +20,4 @@ useful for working on BuildStream itself. buildstream.scriptelement buildstream.sandbox.sandbox buildstream.utils - buildstream.plugintestutils + buildstream.testing diff --git a/tests/artifactcache/cache_size.py b/tests/artifactcache/cache_size.py index c6ba15794..09f0f25d0 100644 --- a/tests/artifactcache/cache_size.py +++ b/tests/artifactcache/cache_size.py @@ -4,7 +4,7 @@ from unittest import mock from buildstream import _yaml from buildstream._cas.cascache import CACHE_SIZE_FILE from buildstream._exceptions import ErrorDomain -from buildstream.plugintestutils import cli +from buildstream.testing import cli from tests.testutils import create_element_size diff --git a/tests/artifactcache/config.py b/tests/artifactcache/config.py index c3b09bfb1..8adbb3274 100644 --- a/tests/artifactcache/config.py +++ b/tests/artifactcache/config.py @@ -10,7 +10,7 @@ from buildstream.utils import _deduplicate from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils.runcli import cli +from buildstream.testing.runcli import cli DATA_DIR = os.path.dirname(os.path.realpath(__file__)) diff --git a/tests/artifactcache/expiry.py b/tests/artifactcache/expiry.py index 7ada656ab..6aa518f1a 100644 --- a/tests/artifactcache/expiry.py +++ b/tests/artifactcache/expiry.py @@ -24,7 +24,7 @@ from unittest import mock import pytest from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils import cli +from buildstream.testing import cli from tests.testutils import create_element_size, update_element_size, wait_for_cache_granularity diff --git a/tests/artifactcache/junctions.py b/tests/artifactcache/junctions.py index 9b7ebe2ec..1eb67b659 100644 --- a/tests/artifactcache/junctions.py +++ b/tests/artifactcache/junctions.py @@ -3,7 +3,7 @@ import shutil import pytest from buildstream import _yaml -from buildstream.plugintestutils import cli +from buildstream.testing import cli from tests.testutils import create_artifact_share diff --git a/tests/artifactcache/pull.py b/tests/artifactcache/pull.py index d75b6d3c7..96fdef812 100644 --- a/tests/artifactcache/pull.py +++ b/tests/artifactcache/pull.py @@ -8,7 +8,7 @@ from buildstream import _yaml, _signals, utils from buildstream._context import Context from buildstream._project import Project from buildstream._protos.build.bazel.remote.execution.v2 import remote_execution_pb2 -from buildstream.plugintestutils import cli +from buildstream.testing import cli from tests.testutils import create_artifact_share diff --git a/tests/artifactcache/push.py b/tests/artifactcache/push.py index 426d22f24..7c117e344 100644 --- a/tests/artifactcache/push.py +++ b/tests/artifactcache/push.py @@ -9,7 +9,7 @@ from buildstream._context import Context from buildstream._project import Project from buildstream._protos.build.bazel.remote.execution.v2 import remote_execution_pb2 from buildstream.storage._casbaseddirectory import CasBasedDirectory -from buildstream.plugintestutils import cli +from buildstream.testing import cli from tests.testutils import create_artifact_share diff --git a/tests/cachekey/cachekey.py b/tests/cachekey/cachekey.py index 3fc5d73ee..671bbb3a1 100644 --- a/tests/cachekey/cachekey.py +++ b/tests/cachekey/cachekey.py @@ -44,7 +44,7 @@ import os import pytest -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import from buildstream.plugin import CoreWarnings from buildstream import _yaml from tests.testutils.site import HAVE_BZR, HAVE_GIT, HAVE_OSTREE, IS_LINUX, MACHINE_ARCH diff --git a/tests/cachekey/update.py b/tests/cachekey/update.py index 3e0924925..68016ed6a 100755 --- a/tests/cachekey/update.py +++ b/tests/cachekey/update.py @@ -13,7 +13,7 @@ # import os import tempfile -from buildstream.plugintestutils.runcli import Cli +from buildstream.testing.runcli import Cli # This weird try / except is needed, because this will be imported differently # when pytest runner imports them vs when you run the updater directly from diff --git a/tests/conftest.py b/tests/conftest.py index fefd2f755..9b8ff2414 100755 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -24,7 +24,7 @@ import shutil import tempfile import pytest from buildstream._platform.platform import Platform -from buildstream.plugintestutils import register_repo_kind, sourcetests_collection_hook +from buildstream.testing import register_repo_kind, sourcetests_collection_hook from tests.testutils.repo.git import Git from tests.testutils.repo.bzr import Bzr @@ -177,6 +177,6 @@ register_repo_kind('zip', Zip) # This hook enables pytest to collect the templated source tests from -# buildstream.plugintestutils +# buildstream.testing def pytest_sessionstart(session): sourcetests_collection_hook(session) diff --git a/tests/elements/filter.py b/tests/elements/filter.py index 2c5ca88b7..d89c834e0 100644 --- a/tests/elements/filter.py +++ b/tests/elements/filter.py @@ -6,8 +6,8 @@ import shutil import pytest -from buildstream.plugintestutils import create_repo -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import create_repo +from buildstream.testing import cli # pylint: disable=unused-import from buildstream._exceptions import ErrorDomain from buildstream import _yaml diff --git a/tests/examples/autotools.py b/tests/examples/autotools.py index 0c86e3afe..03b98a5f4 100644 --- a/tests/examples/autotools.py +++ b/tests/examples/autotools.py @@ -4,8 +4,8 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli # pylint: disable=unused-import -from buildstream.plugintestutils.integration import assert_contains +from buildstream.testing import cli_integration as cli # pylint: disable=unused-import +from buildstream.testing.integration import assert_contains from tests.testutils.site import HAVE_BWRAP, IS_LINUX, MACHINE_ARCH pytestmark = pytest.mark.integration diff --git a/tests/examples/developing.py b/tests/examples/developing.py index 5c8c4a8ea..6e17a7bc1 100644 --- a/tests/examples/developing.py +++ b/tests/examples/developing.py @@ -4,8 +4,8 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli # pylint: disable=unused-import -from buildstream.plugintestutils.integration import assert_contains +from buildstream.testing import cli_integration as cli # pylint: disable=unused-import +from buildstream.testing.integration import assert_contains import tests.testutils.patch as patch from tests.testutils.site import HAVE_BWRAP, IS_LINUX, MACHINE_ARCH diff --git a/tests/examples/first-project.py b/tests/examples/first-project.py index 4d1e29d31..d95c8293c 100644 --- a/tests/examples/first-project.py +++ b/tests/examples/first-project.py @@ -4,8 +4,8 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli # pylint: disable=unused-import -from buildstream.plugintestutils.integration import assert_contains +from buildstream.testing import cli_integration as cli # pylint: disable=unused-import +from buildstream.testing.integration import assert_contains from tests.testutils.site import IS_LINUX diff --git a/tests/examples/flatpak-autotools.py b/tests/examples/flatpak-autotools.py index 4ee7f37d6..8af564eb1 100644 --- a/tests/examples/flatpak-autotools.py +++ b/tests/examples/flatpak-autotools.py @@ -4,8 +4,8 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli # pylint: disable=unused-import -from buildstream.plugintestutils.integration import assert_contains +from buildstream.testing import cli_integration as cli # pylint: disable=unused-import +from buildstream.testing.integration import assert_contains from tests.testutils.site import HAVE_OSTREE, IS_LINUX, MACHINE_ARCH diff --git a/tests/examples/integration-commands.py b/tests/examples/integration-commands.py index 44bbf041a..ad5119600 100644 --- a/tests/examples/integration-commands.py +++ b/tests/examples/integration-commands.py @@ -4,7 +4,7 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli # pylint: disable=unused-import +from buildstream.testing import cli_integration as cli # pylint: disable=unused-import from tests.testutils.site import HAVE_BWRAP, IS_LINUX, MACHINE_ARCH diff --git a/tests/examples/junctions.py b/tests/examples/junctions.py index 26fa8c350..695bfe8c8 100644 --- a/tests/examples/junctions.py +++ b/tests/examples/junctions.py @@ -4,7 +4,7 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli # pylint: disable=unused-import +from buildstream.testing import cli_integration as cli # pylint: disable=unused-import from tests.testutils.site import IS_LINUX, HAVE_BWRAP, MACHINE_ARCH pytestmark = pytest.mark.integration diff --git a/tests/examples/running-commands.py b/tests/examples/running-commands.py index 41920ce73..7089f143e 100644 --- a/tests/examples/running-commands.py +++ b/tests/examples/running-commands.py @@ -4,7 +4,7 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli # pylint: disable=unused-import +from buildstream.testing import cli_integration as cli # pylint: disable=unused-import from tests.testutils.site import IS_LINUX, HAVE_BWRAP, MACHINE_ARCH diff --git a/tests/external_plugins.py b/tests/external_plugins.py index 50b016b74..f6f67707b 100644 --- a/tests/external_plugins.py +++ b/tests/external_plugins.py @@ -78,13 +78,7 @@ if __name__ == "__main__": # directly to it's pytest invocations _, tmpdir, *pytest_args = sys.argv - ALL_EXTERNAL_PLUGINS = [ - ExternalPluginRepo( - name='bst-plugins-template', - url='https://gitlab.com/BuildStream/bst-plugins-template.git', - ref='master' - ), - ] + ALL_EXTERNAL_PLUGINS = [] exit_code = 0 for plugin in ALL_EXTERNAL_PLUGINS: diff --git a/tests/format/assertion.py b/tests/format/assertion.py index cfab105b6..7e87977cb 100644 --- a/tests/format/assertion.py +++ b/tests/format/assertion.py @@ -4,7 +4,7 @@ import os import pytest from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory DATA_DIR = os.path.join( diff --git a/tests/format/dependencies.py b/tests/format/dependencies.py index 780eac73e..15b6e1f4a 100644 --- a/tests/format/dependencies.py +++ b/tests/format/dependencies.py @@ -5,7 +5,7 @@ import os import pytest from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import DATA_DIR = os.path.dirname(os.path.realpath(__file__)) diff --git a/tests/format/include.py b/tests/format/include.py index 73f8092c5..bfadce7ed 100644 --- a/tests/format/include.py +++ b/tests/format/include.py @@ -6,8 +6,8 @@ import textwrap import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils import cli # pylint: disable=unused-import -from buildstream.plugintestutils import create_repo +from buildstream.testing import cli # pylint: disable=unused-import +from buildstream.testing import create_repo from tests.testutils import generate_junction diff --git a/tests/format/junctions.py b/tests/format/junctions.py index 94562cb4e..30891433b 100644 --- a/tests/format/junctions.py +++ b/tests/format/junctions.py @@ -8,8 +8,8 @@ import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils import cli # pylint: disable=unused-import -from buildstream.plugintestutils import create_repo +from buildstream.testing import cli # pylint: disable=unused-import +from buildstream.testing import create_repo from tests.testutils.site import HAVE_GIT diff --git a/tests/format/listdirectiveerrors.py b/tests/format/listdirectiveerrors.py index ec2429dd5..269b521a4 100644 --- a/tests/format/listdirectiveerrors.py +++ b/tests/format/listdirectiveerrors.py @@ -4,7 +4,7 @@ import os import pytest from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory DATA_DIR = os.path.dirname(os.path.realpath(__file__)) diff --git a/tests/format/optionarch.py b/tests/format/optionarch.py index a7d38c8be..a35ac685d 100644 --- a/tests/format/optionarch.py +++ b/tests/format/optionarch.py @@ -7,7 +7,7 @@ import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import from tests.testutils import override_platform_uname diff --git a/tests/format/optionbool.py b/tests/format/optionbool.py index 40f8dfb33..0d1ee601e 100644 --- a/tests/format/optionbool.py +++ b/tests/format/optionbool.py @@ -5,7 +5,7 @@ import os import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory DATA_DIR = os.path.dirname(os.path.realpath(__file__)) diff --git a/tests/format/optioneltmask.py b/tests/format/optioneltmask.py index 08f002b58..d33b5771c 100644 --- a/tests/format/optioneltmask.py +++ b/tests/format/optioneltmask.py @@ -5,7 +5,7 @@ import os import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory DATA_DIR = os.path.dirname(os.path.realpath(__file__)) diff --git a/tests/format/optionenum.py b/tests/format/optionenum.py index d729cbfee..b8a96b0c2 100644 --- a/tests/format/optionenum.py +++ b/tests/format/optionenum.py @@ -5,7 +5,7 @@ import os import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory DATA_DIR = os.path.dirname(os.path.realpath(__file__)) diff --git a/tests/format/optionexports.py b/tests/format/optionexports.py index 8ad063e74..5df7522b5 100644 --- a/tests/format/optionexports.py +++ b/tests/format/optionexports.py @@ -4,7 +4,7 @@ import os import pytest from buildstream import _yaml -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory DATA_DIR = os.path.dirname(os.path.realpath(__file__)) diff --git a/tests/format/optionflags.py b/tests/format/optionflags.py index fe61870d7..e28c54236 100644 --- a/tests/format/optionflags.py +++ b/tests/format/optionflags.py @@ -5,7 +5,7 @@ import os import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory DATA_DIR = os.path.dirname(os.path.realpath(__file__)) diff --git a/tests/format/optionos.py b/tests/format/optionos.py index 6856fd69c..57277b106 100644 --- a/tests/format/optionos.py +++ b/tests/format/optionos.py @@ -7,7 +7,7 @@ import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import from tests.testutils import override_platform_uname diff --git a/tests/format/optionoverrides.py b/tests/format/optionoverrides.py index 2e4d26a16..60d02b3a3 100644 --- a/tests/format/optionoverrides.py +++ b/tests/format/optionoverrides.py @@ -4,7 +4,7 @@ import os import pytest from buildstream import _yaml -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory DATA_DIR = os.path.dirname(os.path.realpath(__file__)) diff --git a/tests/format/options.py b/tests/format/options.py index c9f29d64d..3a8210dc3 100644 --- a/tests/format/options.py +++ b/tests/format/options.py @@ -5,7 +5,7 @@ import os import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory DATA_DIR = os.path.join( diff --git a/tests/format/project.py b/tests/format/project.py index 5813bb389..fbb742d47 100644 --- a/tests/format/project.py +++ b/tests/format/project.py @@ -5,7 +5,7 @@ import os import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils import filetypegenerator diff --git a/tests/format/projectoverrides.py b/tests/format/projectoverrides.py index 60851b9d5..4b0c3f4d0 100644 --- a/tests/format/projectoverrides.py +++ b/tests/format/projectoverrides.py @@ -4,7 +4,7 @@ import os import pytest from buildstream import _yaml -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory DATA_DIR = os.path.join( diff --git a/tests/format/variables.py b/tests/format/variables.py index b62de7460..87e3b2903 100644 --- a/tests/format/variables.py +++ b/tests/format/variables.py @@ -8,7 +8,7 @@ import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory diff --git a/tests/frontend/artifact.py b/tests/frontend/artifact.py index 887649f96..10cb4f513 100644 --- a/tests/frontend/artifact.py +++ b/tests/frontend/artifact.py @@ -24,7 +24,7 @@ import os import pytest -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils import create_artifact_share diff --git a/tests/frontend/buildcheckout.py b/tests/frontend/buildcheckout.py index 5145b1222..b181e29bb 100644 --- a/tests/frontend/buildcheckout.py +++ b/tests/frontend/buildcheckout.py @@ -11,7 +11,7 @@ import pytest from tests.testutils.site import IS_WINDOWS from tests.testutils import generate_junction, yaml_file_get_provenance -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason diff --git a/tests/frontend/buildtrack.py b/tests/frontend/buildtrack.py index d4dc93aac..404882beb 100644 --- a/tests/frontend/buildtrack.py +++ b/tests/frontend/buildtrack.py @@ -9,8 +9,8 @@ import itertools import pytest from buildstream import _yaml -from buildstream.plugintestutils import create_repo -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import create_repo +from buildstream.testing import cli # pylint: disable=unused-import from buildstream._exceptions import ErrorDomain from . import configure_project diff --git a/tests/frontend/completions.py b/tests/frontend/completions.py index 3876dcf15..773eec040 100644 --- a/tests/frontend/completions.py +++ b/tests/frontend/completions.py @@ -3,7 +3,7 @@ import os import pytest -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import # Project directory DATA_DIR = os.path.join( diff --git a/tests/frontend/compose_splits.py b/tests/frontend/compose_splits.py index adce813bd..f1f9b73be 100644 --- a/tests/frontend/compose_splits.py +++ b/tests/frontend/compose_splits.py @@ -3,7 +3,7 @@ import os import pytest -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory DATA_DIR = os.path.join( diff --git a/tests/frontend/configurable_warnings.py b/tests/frontend/configurable_warnings.py index fe522f33a..c63a0b673 100644 --- a/tests/frontend/configurable_warnings.py +++ b/tests/frontend/configurable_warnings.py @@ -8,7 +8,7 @@ import pytest from buildstream.plugin import CoreWarnings from buildstream._exceptions import ErrorDomain from buildstream import _yaml -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import TOP_DIR = os.path.join( os.path.dirname(os.path.realpath(__file__)), diff --git a/tests/frontend/cross_junction_workspace.py b/tests/frontend/cross_junction_workspace.py index a93d5c132..81fd43487 100644 --- a/tests/frontend/cross_junction_workspace.py +++ b/tests/frontend/cross_junction_workspace.py @@ -2,8 +2,8 @@ # pylint: disable=redefined-outer-name import os -from buildstream.plugintestutils import cli # pylint: disable=unused-import -from buildstream.plugintestutils import create_repo +from buildstream.testing import cli # pylint: disable=unused-import +from buildstream.testing import create_repo from buildstream import _yaml diff --git a/tests/frontend/fetch.py b/tests/frontend/fetch.py index cea7ff129..e330cd407 100644 --- a/tests/frontend/fetch.py +++ b/tests/frontend/fetch.py @@ -5,8 +5,8 @@ import os import pytest from tests.testutils import generate_junction, yaml_file_get_provenance -from buildstream.plugintestutils import create_repo -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import create_repo +from buildstream.testing import cli # pylint: disable=unused-import from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason diff --git a/tests/frontend/help.py b/tests/frontend/help.py index b52ace302..3bc18499b 100644 --- a/tests/frontend/help.py +++ b/tests/frontend/help.py @@ -2,7 +2,7 @@ # pylint: disable=redefined-outer-name import pytest -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import def assert_help(cli_output): diff --git a/tests/frontend/init.py b/tests/frontend/init.py index 06babce43..fa4623c63 100644 --- a/tests/frontend/init.py +++ b/tests/frontend/init.py @@ -3,7 +3,7 @@ import os import pytest -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from buildstream import _yaml from buildstream._frontend.app import App diff --git a/tests/frontend/logging.py b/tests/frontend/logging.py index 49e3a70c6..e7279ac4c 100644 --- a/tests/frontend/logging.py +++ b/tests/frontend/logging.py @@ -6,11 +6,11 @@ import re import pytest -from buildstream.plugintestutils import create_repo +from buildstream.testing import create_repo from buildstream import _yaml from buildstream._exceptions import ErrorDomain -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import # Project directory DATA_DIR = os.path.join( diff --git a/tests/frontend/mirror.py b/tests/frontend/mirror.py index 47f94289f..f7427cf88 100644 --- a/tests/frontend/mirror.py +++ b/tests/frontend/mirror.py @@ -5,8 +5,8 @@ import os import pytest from buildstream import _yaml -from buildstream.plugintestutils import create_repo -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import create_repo +from buildstream.testing import cli # pylint: disable=unused-import # Project directory diff --git a/tests/frontend/order.py b/tests/frontend/order.py index 5eb5b299d..7f354c88e 100644 --- a/tests/frontend/order.py +++ b/tests/frontend/order.py @@ -4,8 +4,8 @@ import os import pytest -from buildstream.plugintestutils import create_repo -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import create_repo +from buildstream.testing import cli # pylint: disable=unused-import from buildstream import _yaml # Project directory diff --git a/tests/frontend/overlaps.py b/tests/frontend/overlaps.py index 57a8ce630..6f6ab26a3 100644 --- a/tests/frontend/overlaps.py +++ b/tests/frontend/overlaps.py @@ -3,7 +3,7 @@ import os import pytest -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import from buildstream._exceptions import ErrorDomain from buildstream import _yaml from buildstream.plugin import CoreWarnings diff --git a/tests/frontend/pull.py b/tests/frontend/pull.py index 2a1006ea2..cc62afe92 100644 --- a/tests/frontend/pull.py +++ b/tests/frontend/pull.py @@ -6,7 +6,7 @@ import shutil import stat import pytest from buildstream import utils -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils import create_artifact_share, generate_junction diff --git a/tests/frontend/push.py b/tests/frontend/push.py index b2991ada7..67c53f2bb 100644 --- a/tests/frontend/push.py +++ b/tests/frontend/push.py @@ -27,7 +27,7 @@ import os import pytest from buildstream._exceptions import ErrorDomain -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils import create_artifact_share, create_element_size, generate_junction, wait_for_cache_granularity diff --git a/tests/frontend/rebuild.py b/tests/frontend/rebuild.py index cf517f3c1..1cdb45d11 100644 --- a/tests/frontend/rebuild.py +++ b/tests/frontend/rebuild.py @@ -3,7 +3,7 @@ import os import pytest -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import # Project directory DATA_DIR = os.path.join( diff --git a/tests/frontend/remote-caches.py b/tests/frontend/remote-caches.py index 3e3e226fc..e3f10e6f7 100644 --- a/tests/frontend/remote-caches.py +++ b/tests/frontend/remote-caches.py @@ -23,7 +23,7 @@ import os import shutil import pytest -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from buildstream import _yaml from tests.testutils import create_artifact_share, create_element_size diff --git a/tests/frontend/show.py b/tests/frontend/show.py index 7e5ebfb77..5acb99392 100644 --- a/tests/frontend/show.py +++ b/tests/frontend/show.py @@ -7,7 +7,7 @@ import shutil import itertools import pytest from tests.testutils import generate_junction, yaml_file_get_provenance -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason diff --git a/tests/frontend/source_checkout.py b/tests/frontend/source_checkout.py index c43bea6bd..0bedfe1e2 100644 --- a/tests/frontend/source_checkout.py +++ b/tests/frontend/source_checkout.py @@ -6,7 +6,7 @@ import tarfile import pytest -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from buildstream import utils, _yaml from buildstream._exceptions import ErrorDomain diff --git a/tests/frontend/track.py b/tests/frontend/track.py index 17d0cd827..808bf0593 100644 --- a/tests/frontend/track.py +++ b/tests/frontend/track.py @@ -5,8 +5,8 @@ import stat import os import pytest -from buildstream.plugintestutils import create_repo -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import create_repo +from buildstream.testing import cli # pylint: disable=unused-import from buildstream._exceptions import ErrorDomain, LoadErrorReason from buildstream import _yaml from tests.testutils import generate_junction, yaml_file_get_provenance diff --git a/tests/frontend/version.py b/tests/frontend/version.py index f9228c0bc..e7db19915 100644 --- a/tests/frontend/version.py +++ b/tests/frontend/version.py @@ -1,7 +1,7 @@ # Pylint doesn't play well with fixtures and dependency injection from pytest # pylint: disable=redefined-outer-name -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import # For utils.get_bst_version() diff --git a/tests/frontend/workspace.py b/tests/frontend/workspace.py index 522bbffab..1db23ccc4 100644 --- a/tests/frontend/workspace.py +++ b/tests/frontend/workspace.py @@ -36,8 +36,8 @@ import pytest from tests.testutils import create_artifact_share, create_element_size, wait_for_cache_granularity -from buildstream.plugintestutils import create_repo, ALL_REPO_KINDS -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import create_repo, ALL_REPO_KINDS +from buildstream.testing import cli # pylint: disable=unused-import from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason from buildstream._workspaces import BST_WORKSPACE_FORMAT_VERSION diff --git a/tests/integration/artifact.py b/tests/integration/artifact.py index 0718de893..a5e1f4d77 100644 --- a/tests/integration/artifact.py +++ b/tests/integration/artifact.py @@ -25,7 +25,7 @@ import shutil import tempfile from buildstream import utils -from buildstream.plugintestutils import cli_integration as cli +from buildstream.testing import cli_integration as cli from tests.testutils import create_artifact_share from tests.testutils.site import HAVE_SANDBOX from buildstream._cas import CASCache diff --git a/tests/integration/autotools.py b/tests/integration/autotools.py index d9dcc10ed..80365b8ee 100644 --- a/tests/integration/autotools.py +++ b/tests/integration/autotools.py @@ -1,8 +1,8 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli -from buildstream.plugintestutils.integration import assert_contains +from buildstream.testing import cli_integration as cli +from buildstream.testing.integration import assert_contains from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/integration/build-uid.py b/tests/integration/build-uid.py index bb2e013c2..f2e50a3c7 100644 --- a/tests/integration/build-uid.py +++ b/tests/integration/build-uid.py @@ -1,7 +1,7 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli +from buildstream.testing import cli_integration as cli from tests.testutils.site import HAVE_BWRAP, IS_LINUX, HAVE_SANDBOX diff --git a/tests/integration/cachedfail.py b/tests/integration/cachedfail.py index 34849f8bc..28174353d 100644 --- a/tests/integration/cachedfail.py +++ b/tests/integration/cachedfail.py @@ -3,7 +3,7 @@ import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain -from buildstream.plugintestutils import cli_integration as cli +from buildstream.testing import cli_integration as cli from tests.conftest import clean_platform_cache from tests.testutils import create_artifact_share diff --git a/tests/integration/cmake.py b/tests/integration/cmake.py index ddd8ce95d..a69b9cd80 100644 --- a/tests/integration/cmake.py +++ b/tests/integration/cmake.py @@ -1,8 +1,8 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli -from buildstream.plugintestutils.integration import assert_contains +from buildstream.testing import cli_integration as cli +from buildstream.testing.integration import assert_contains from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/integration/compose-symlinks.py b/tests/integration/compose-symlinks.py index 6f9e0ea7d..e510d9573 100644 --- a/tests/integration/compose-symlinks.py +++ b/tests/integration/compose-symlinks.py @@ -1,7 +1,7 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli +from buildstream.testing import cli_integration as cli pytestmark = pytest.mark.integration diff --git a/tests/integration/compose.py b/tests/integration/compose.py index e0de38655..dab05fd9f 100644 --- a/tests/integration/compose.py +++ b/tests/integration/compose.py @@ -3,8 +3,8 @@ import pytest from buildstream import _yaml -from buildstream.plugintestutils import cli_integration as cli -from buildstream.plugintestutils.integration import walk_dir +from buildstream.testing import cli_integration as cli +from buildstream.testing.integration import walk_dir from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/integration/import.py b/tests/integration/import.py index 501f8aa9e..26c8cf6a0 100644 --- a/tests/integration/import.py +++ b/tests/integration/import.py @@ -3,8 +3,8 @@ import pytest from buildstream import _yaml -from buildstream.plugintestutils import cli_integration as cli -from buildstream.plugintestutils.integration import walk_dir +from buildstream.testing import cli_integration as cli +from buildstream.testing.integration import walk_dir pytestmark = pytest.mark.integration diff --git a/tests/integration/make.py b/tests/integration/make.py index 581d919e7..f59c2b0d6 100644 --- a/tests/integration/make.py +++ b/tests/integration/make.py @@ -1,8 +1,8 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli -from buildstream.plugintestutils.integration import assert_contains +from buildstream.testing import cli_integration as cli +from buildstream.testing.integration import assert_contains from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/integration/manual.py b/tests/integration/manual.py index 76ea1dc66..0ba650bde 100644 --- a/tests/integration/manual.py +++ b/tests/integration/manual.py @@ -3,7 +3,7 @@ import pytest from buildstream import _yaml -from buildstream.plugintestutils import cli_integration as cli +from buildstream.testing import cli_integration as cli from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/integration/messages.py b/tests/integration/messages.py index 3697d0bf7..2211ea468 100644 --- a/tests/integration/messages.py +++ b/tests/integration/messages.py @@ -22,7 +22,7 @@ import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain -from buildstream.plugintestutils import cli_integration as cli +from buildstream.testing import cli_integration as cli from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/integration/pip_element.py b/tests/integration/pip_element.py index a3f363bc8..9ef163125 100644 --- a/tests/integration/pip_element.py +++ b/tests/integration/pip_element.py @@ -4,8 +4,8 @@ import pytest from buildstream import _yaml -from buildstream.plugintestutils import cli_integration as cli -from buildstream.plugintestutils.integration import assert_contains +from buildstream.testing import cli_integration as cli +from buildstream.testing.integration import assert_contains from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/integration/pip_source.py b/tests/integration/pip_source.py index 6ee76005c..645dad444 100644 --- a/tests/integration/pip_source.py +++ b/tests/integration/pip_source.py @@ -3,8 +3,8 @@ import pytest from buildstream import _yaml -from buildstream.plugintestutils import cli_integration as cli -from buildstream.plugintestutils.integration import assert_contains +from buildstream.testing import cli_integration as cli +from buildstream.testing.integration import assert_contains from tests.testutils.python_repo import setup_pypi_repo from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/integration/pullbuildtrees.py b/tests/integration/pullbuildtrees.py index bdbcad911..91acff4a3 100644 --- a/tests/integration/pullbuildtrees.py +++ b/tests/integration/pullbuildtrees.py @@ -8,7 +8,7 @@ from tests.testutils import create_artifact_share from tests.testutils.site import HAVE_SANDBOX from buildstream import utils -from buildstream.plugintestutils import cli, cli_integration as cli2 +from buildstream.testing import cli, cli_integration as cli2 from buildstream._cas import CASCache from buildstream._exceptions import ErrorDomain, LoadErrorReason diff --git a/tests/integration/sandbox-bwrap.py b/tests/integration/sandbox-bwrap.py index 29227501c..549de4ed0 100644 --- a/tests/integration/sandbox-bwrap.py +++ b/tests/integration/sandbox-bwrap.py @@ -3,7 +3,7 @@ import pytest from buildstream._exceptions import ErrorDomain -from buildstream.plugintestutils import cli_integration as cli +from buildstream.testing import cli_integration as cli from tests.testutils.site import HAVE_BWRAP, HAVE_BWRAP_JSON_STATUS diff --git a/tests/integration/script.py b/tests/integration/script.py index 1500af724..acc752f48 100644 --- a/tests/integration/script.py +++ b/tests/integration/script.py @@ -2,7 +2,7 @@ import os import pytest from buildstream import _yaml -from buildstream.plugintestutils import cli_integration as cli +from buildstream.testing import cli_integration as cli from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/integration/shell.py b/tests/integration/shell.py index fb01f45ea..a9fb4855a 100644 --- a/tests/integration/shell.py +++ b/tests/integration/shell.py @@ -2,7 +2,7 @@ import os import pytest from buildstream import _yaml -from buildstream.plugintestutils import cli_integration as cli +from buildstream.testing import cli_integration as cli from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/integration/shellbuildtrees.py b/tests/integration/shellbuildtrees.py index c12a0d404..3d59c78b9 100644 --- a/tests/integration/shellbuildtrees.py +++ b/tests/integration/shellbuildtrees.py @@ -4,7 +4,7 @@ import shutil from tests.testutils import create_artifact_share from tests.testutils.site import HAVE_SANDBOX -from buildstream.plugintestutils import cli, cli_integration +from buildstream.testing import cli, cli_integration from buildstream._exceptions import ErrorDomain diff --git a/tests/integration/sockets.py b/tests/integration/sockets.py index 17c3becea..af09c391b 100644 --- a/tests/integration/sockets.py +++ b/tests/integration/sockets.py @@ -1,7 +1,7 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli +from buildstream.testing import cli_integration as cli from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/integration/source-determinism.py b/tests/integration/source-determinism.py index 2f63a4af9..5bb0941d1 100644 --- a/tests/integration/source-determinism.py +++ b/tests/integration/source-determinism.py @@ -2,8 +2,8 @@ import os import pytest from buildstream import _yaml -from buildstream.plugintestutils import cli_integration as cli -from buildstream.plugintestutils import create_repo +from buildstream.testing import cli_integration as cli +from buildstream.testing import create_repo from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/integration/stack.py b/tests/integration/stack.py index e75c6a450..9cc917e0e 100644 --- a/tests/integration/stack.py +++ b/tests/integration/stack.py @@ -1,7 +1,7 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli +from buildstream.testing import cli_integration as cli from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/integration/symlinks.py b/tests/integration/symlinks.py index 5752281de..02238aebc 100644 --- a/tests/integration/symlinks.py +++ b/tests/integration/symlinks.py @@ -1,7 +1,7 @@ import os import pytest -from buildstream.plugintestutils import cli_integration as cli +from buildstream.testing import cli_integration as cli from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/integration/workspace.py b/tests/integration/workspace.py index 8ec6db3c8..4ee0050d7 100644 --- a/tests/integration/workspace.py +++ b/tests/integration/workspace.py @@ -2,7 +2,7 @@ import os import pytest from buildstream import _yaml -from buildstream.plugintestutils import cli_integration as cli +from buildstream.testing import cli_integration as cli from tests.testutils.site import HAVE_SANDBOX diff --git a/tests/plugins/deprecationwarnings/deprecationwarnings.py b/tests/plugins/deprecationwarnings/deprecationwarnings.py index 0f61ce271..75652bf06 100644 --- a/tests/plugins/deprecationwarnings/deprecationwarnings.py +++ b/tests/plugins/deprecationwarnings/deprecationwarnings.py @@ -1,6 +1,6 @@ import pytest import os -from buildstream.plugintestutils import cli +from buildstream.testing import cli DATA_DIR = os.path.join( diff --git a/tests/remoteexecution/partial.py b/tests/remoteexecution/partial.py index 907fc507d..ee0fc25b4 100644 --- a/tests/remoteexecution/partial.py +++ b/tests/remoteexecution/partial.py @@ -2,8 +2,8 @@ import os import pytest from buildstream._exceptions import ErrorDomain -from buildstream.plugintestutils import cli_remote_execution as cli -from buildstream.plugintestutils.integration import assert_contains +from buildstream.testing import cli_remote_execution as cli +from buildstream.testing.integration import assert_contains pytestmark = pytest.mark.remoteexecution diff --git a/tests/remoteexecution/simple.py b/tests/remoteexecution/simple.py index 152a40e31..53f4c65a4 100644 --- a/tests/remoteexecution/simple.py +++ b/tests/remoteexecution/simple.py @@ -1,8 +1,8 @@ import os import pytest -from buildstream.plugintestutils import cli_remote_execution as cli -from buildstream.plugintestutils.integration import assert_contains +from buildstream.testing import cli_remote_execution as cli +from buildstream.testing.integration import assert_contains pytestmark = pytest.mark.remoteexecution diff --git a/tests/sandboxes/missing-command.py b/tests/sandboxes/missing-command.py index ee6d11280..8156eac9b 100644 --- a/tests/sandboxes/missing-command.py +++ b/tests/sandboxes/missing-command.py @@ -3,7 +3,7 @@ import pytest from buildstream._exceptions import ErrorDomain -from buildstream.plugintestutils import cli +from buildstream.testing import cli DATA_DIR = os.path.join( diff --git a/tests/sandboxes/missing_dependencies.py b/tests/sandboxes/missing_dependencies.py index 850fddaa3..22fecaa6e 100644 --- a/tests/sandboxes/missing_dependencies.py +++ b/tests/sandboxes/missing_dependencies.py @@ -1,6 +1,6 @@ import os import pytest -from buildstream.plugintestutils import cli +from buildstream.testing import cli from tests.testutils.site import IS_LINUX from buildstream import _yaml diff --git a/tests/sandboxes/remote-exec-config.py b/tests/sandboxes/remote-exec-config.py index 31ba11678..82943e4b1 100644 --- a/tests/sandboxes/remote-exec-config.py +++ b/tests/sandboxes/remote-exec-config.py @@ -5,7 +5,7 @@ import os from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils.runcli import cli +from buildstream.testing.runcli import cli DATA_DIR = os.path.join( os.path.dirname(os.path.realpath(__file__)), diff --git a/tests/sourcecache/config.py b/tests/sourcecache/config.py index 9f166d054..7c33adbe0 100644 --- a/tests/sourcecache/config.py +++ b/tests/sourcecache/config.py @@ -27,7 +27,7 @@ import pytest from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import DATA_DIR = os.path.dirname(os.path.realpath(__file__)) diff --git a/tests/sourcecache/fetch.py b/tests/sourcecache/fetch.py index 7f82388ab..bc025cbd5 100644 --- a/tests/sourcecache/fetch.py +++ b/tests/sourcecache/fetch.py @@ -27,8 +27,8 @@ from buildstream._exceptions import ErrorDomain from buildstream._context import Context from buildstream._project import Project from buildstream import _yaml -from buildstream.plugintestutils import cli # pylint: disable=unused-import -from buildstream.plugintestutils import create_repo +from buildstream.testing import cli # pylint: disable=unused-import +from buildstream.testing import create_repo from tests.testutils import create_artifact_share DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "project") diff --git a/tests/sourcecache/push.py b/tests/sourcecache/push.py index 825d2614e..abab1616c 100644 --- a/tests/sourcecache/push.py +++ b/tests/sourcecache/push.py @@ -27,8 +27,8 @@ from buildstream._context import Context from buildstream._exceptions import ErrorDomain from buildstream._project import Project from buildstream import _yaml -from buildstream.plugintestutils import cli # pylint: disable=unused-import -from buildstream.plugintestutils import create_repo +from buildstream.testing import cli # pylint: disable=unused-import +from buildstream.testing import create_repo from tests.testutils import create_artifact_share diff --git a/tests/sourcecache/source-checkout.py b/tests/sourcecache/source-checkout.py index 517a28108..15c80fde9 100644 --- a/tests/sourcecache/source-checkout.py +++ b/tests/sourcecache/source-checkout.py @@ -27,7 +27,7 @@ import shutil import pytest from buildstream._exceptions import ErrorDomain -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import from tests.testutils.element_generators import create_element_size diff --git a/tests/sourcecache/staging.py b/tests/sourcecache/staging.py index 5c1c4f358..318285292 100644 --- a/tests/sourcecache/staging.py +++ b/tests/sourcecache/staging.py @@ -28,7 +28,7 @@ import pytest from buildstream._context import Context from buildstream._project import Project -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import from tests.testutils.element_generators import create_element_size diff --git a/tests/sourcecache/workspace.py b/tests/sourcecache/workspace.py index 8bde39ee6..22316c4fe 100644 --- a/tests/sourcecache/workspace.py +++ b/tests/sourcecache/workspace.py @@ -26,7 +26,7 @@ import shutil import pytest -from buildstream.plugintestutils.runcli import cli # pylint: disable=unused-import +from buildstream.testing.runcli import cli # pylint: disable=unused-import from tests.testutils.artifactshare import create_artifact_share from tests.testutils.element_generators import create_element_size diff --git a/tests/sources/bzr.py b/tests/sources/bzr.py index bf022236b..a11932a49 100644 --- a/tests/sources/bzr.py +++ b/tests/sources/bzr.py @@ -6,8 +6,8 @@ import pytest from buildstream import _yaml -from buildstream.plugintestutils import cli # pylint: disable=unused-import -from buildstream.plugintestutils import create_repo +from buildstream.testing import cli # pylint: disable=unused-import +from buildstream.testing import create_repo from tests.testutils.site import HAVE_BZR DATA_DIR = os.path.join( diff --git a/tests/sources/deb.py b/tests/sources/deb.py index 2538efe3b..69b7c78df 100644 --- a/tests/sources/deb.py +++ b/tests/sources/deb.py @@ -8,7 +8,7 @@ import pytest from buildstream._exceptions import ErrorDomain from buildstream import _yaml -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils.site import HAVE_ARPY from . import list_dir_contents diff --git a/tests/sources/git.py b/tests/sources/git.py index 0f97b77a3..b7b175ee6 100644 --- a/tests/sources/git.py +++ b/tests/sources/git.py @@ -32,8 +32,8 @@ import pytest from buildstream._exceptions import ErrorDomain from buildstream import _yaml from buildstream.plugin import CoreWarnings -from buildstream.plugintestutils import cli # pylint: disable=unused-import -from buildstream.plugintestutils import create_repo +from buildstream.testing import cli # pylint: disable=unused-import +from buildstream.testing import create_repo from tests.testutils.site import HAVE_GIT, HAVE_OLD_GIT diff --git a/tests/sources/keytest.py b/tests/sources/keytest.py index 989f4f1b0..dbfe97ab5 100644 --- a/tests/sources/keytest.py +++ b/tests/sources/keytest.py @@ -25,7 +25,7 @@ import os import pytest from buildstream._exceptions import ErrorDomain -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "project_key_test") diff --git a/tests/sources/local.py b/tests/sources/local.py index e5f6d4cdf..94d45b3e9 100644 --- a/tests/sources/local.py +++ b/tests/sources/local.py @@ -5,7 +5,7 @@ import os import pytest from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils import filetypegenerator DATA_DIR = os.path.join( diff --git a/tests/sources/no_fetch_cached.py b/tests/sources/no_fetch_cached.py index 4a3f71932..69d28615a 100644 --- a/tests/sources/no_fetch_cached.py +++ b/tests/sources/no_fetch_cached.py @@ -6,8 +6,8 @@ import pytest from buildstream import _yaml -from buildstream.plugintestutils import cli # pylint: disable=unused-import -from buildstream.plugintestutils import create_repo +from buildstream.testing import cli # pylint: disable=unused-import +from buildstream.testing import create_repo from tests.testutils.site import HAVE_GIT DATA_DIR = os.path.join( diff --git a/tests/sources/ostree.py b/tests/sources/ostree.py index e75a64663..aefad68fa 100644 --- a/tests/sources/ostree.py +++ b/tests/sources/ostree.py @@ -25,8 +25,8 @@ import pytest from buildstream._exceptions import ErrorDomain from buildstream import _yaml -from buildstream.plugintestutils import cli # pylint: disable=unused-import -from buildstream.plugintestutils import create_repo +from buildstream.testing import cli # pylint: disable=unused-import +from buildstream.testing import create_repo DATA_DIR = os.path.join( os.path.dirname(os.path.realpath(__file__)), diff --git a/tests/sources/patch.py b/tests/sources/patch.py index 49c6594dc..4f9db815b 100644 --- a/tests/sources/patch.py +++ b/tests/sources/patch.py @@ -5,7 +5,7 @@ import os import pytest from buildstream._exceptions import ErrorDomain, LoadErrorReason -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils import filetypegenerator DATA_DIR = os.path.join( diff --git a/tests/sources/pip.py b/tests/sources/pip.py index 0a0a846ef..cf6ea5498 100644 --- a/tests/sources/pip.py +++ b/tests/sources/pip.py @@ -7,7 +7,7 @@ import pytest from buildstream._exceptions import ErrorDomain from buildstream import _yaml from buildstream.plugins.sources.pip import _match_package_name -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import DATA_DIR = os.path.join( os.path.dirname(os.path.realpath(__file__)), diff --git a/tests/sources/previous_source_access.py b/tests/sources/previous_source_access.py index 29d1f3023..a0661ca98 100644 --- a/tests/sources/previous_source_access.py +++ b/tests/sources/previous_source_access.py @@ -4,7 +4,7 @@ import os import pytest -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import DATA_DIR = os.path.join( os.path.dirname(os.path.realpath(__file__)), diff --git a/tests/sources/remote.py b/tests/sources/remote.py index 2a23895ac..8b57151b2 100644 --- a/tests/sources/remote.py +++ b/tests/sources/remote.py @@ -7,7 +7,7 @@ import pytest from buildstream._exceptions import ErrorDomain from buildstream import _yaml -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils.file_server import create_file_server DATA_DIR = os.path.join( diff --git a/tests/sources/tar.py b/tests/sources/tar.py index 7a516459d..8446f485f 100644 --- a/tests/sources/tar.py +++ b/tests/sources/tar.py @@ -12,7 +12,7 @@ import pytest from buildstream._exceptions import ErrorDomain from buildstream import _yaml -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils.file_server import create_file_server from tests.testutils.site import HAVE_LZIP from . import list_dir_contents diff --git a/tests/sources/zip.py b/tests/sources/zip.py index 1c86e56d7..cb7f440f1 100644 --- a/tests/sources/zip.py +++ b/tests/sources/zip.py @@ -8,7 +8,7 @@ import pytest from buildstream._exceptions import ErrorDomain from buildstream import _yaml -from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils.file_server import create_file_server from . import list_dir_contents diff --git a/tests/testutils/element_generators.py b/tests/testutils/element_generators.py index ec1b6bd85..38bafc6b6 100644 --- a/tests/testutils/element_generators.py +++ b/tests/testutils/element_generators.py @@ -2,7 +2,7 @@ import os from buildstream import _yaml from buildstream import utils -from buildstream.plugintestutils import create_repo +from buildstream.testing import create_repo # create_element_size() diff --git a/tests/testutils/junction.py b/tests/testutils/junction.py index 49bc692ed..8132e291c 100644 --- a/tests/testutils/junction.py +++ b/tests/testutils/junction.py @@ -1,5 +1,5 @@ from buildstream import _yaml -from buildstream.plugintestutils import create_repo +from buildstream.testing import create_repo # generate_junction() diff --git a/tests/testutils/repo/bzr.py b/tests/testutils/repo/bzr.py index c006c3fce..53bacad17 100644 --- a/tests/testutils/repo/bzr.py +++ b/tests/testutils/repo/bzr.py @@ -2,7 +2,7 @@ import os import subprocess import pytest -from buildstream.plugintestutils import Repo +from buildstream.testing import Repo from .. import site diff --git a/tests/testutils/repo/git.py b/tests/testutils/repo/git.py index 5c27be3ee..8ffd09c2f 100644 --- a/tests/testutils/repo/git.py +++ b/tests/testutils/repo/git.py @@ -4,7 +4,7 @@ import subprocess import pytest -from buildstream.plugintestutils import Repo +from buildstream.testing import Repo from .. import site diff --git a/tests/testutils/repo/ostree.py b/tests/testutils/repo/ostree.py index d0cef8b88..c43f39ef2 100644 --- a/tests/testutils/repo/ostree.py +++ b/tests/testutils/repo/ostree.py @@ -2,7 +2,7 @@ import subprocess import pytest -from buildstream.plugintestutils import Repo +from buildstream.testing import Repo from .. import site diff --git a/tests/testutils/repo/tar.py b/tests/testutils/repo/tar.py index 6fdf58ae0..63231fa4b 100644 --- a/tests/testutils/repo/tar.py +++ b/tests/testutils/repo/tar.py @@ -3,7 +3,7 @@ import tarfile from buildstream.utils import sha256sum -from buildstream.plugintestutils import Repo +from buildstream.testing import Repo class Tar(Repo): diff --git a/tests/testutils/repo/zip.py b/tests/testutils/repo/zip.py index c57e09e7d..df3f834a9 100644 --- a/tests/testutils/repo/zip.py +++ b/tests/testutils/repo/zip.py @@ -3,7 +3,7 @@ import zipfile from buildstream.utils import sha256sum -from buildstream.plugintestutils import Repo +from buildstream.testing import Repo class Zip(Repo): @@ -136,11 +136,11 @@ whitelist_externals = * # # You should pass this the part of a test node's id after "::". For # example, to run the test -# buildstream/plugintestutils/_sourcetests/fetch.py::test_fetch_cross_junction[git-inline] +# buildstream/testing/_sourcetests/fetch.py::test_fetch_cross_junction[git-inline] # you would do tox -e sourcetests -- test_fetch_cross_junction[git-inline] # # This does rely on the fact that none of the tests in -# buildstream.plugintestutils have the same name. +# buildstream.testing have the same name. # [testenv:sourcetests] commands = pytest --basetemp {envtmpdir} --ignore tests -k "{posargs}" |