summaryrefslogtreecommitdiff
path: root/tests/frontend
diff options
context:
space:
mode:
Diffstat (limited to 'tests/frontend')
-rw-r--r--tests/frontend/artifact.py2
-rw-r--r--tests/frontend/buildcheckout.py2
-rw-r--r--tests/frontend/buildtrack.py4
-rw-r--r--tests/frontend/completions.py2
-rw-r--r--tests/frontend/compose_splits.py2
-rw-r--r--tests/frontend/configurable_warnings.py2
-rw-r--r--tests/frontend/cross_junction_workspace.py4
-rw-r--r--tests/frontend/fetch.py4
-rw-r--r--tests/frontend/help.py2
-rw-r--r--tests/frontend/init.py2
-rw-r--r--tests/frontend/logging.py4
-rw-r--r--tests/frontend/mirror.py4
-rw-r--r--tests/frontend/order.py4
-rw-r--r--tests/frontend/overlaps.py2
-rw-r--r--tests/frontend/pull.py2
-rw-r--r--tests/frontend/push.py2
-rw-r--r--tests/frontend/rebuild.py2
-rw-r--r--tests/frontend/remote-caches.py2
-rw-r--r--tests/frontend/show.py2
-rw-r--r--tests/frontend/source_checkout.py2
-rw-r--r--tests/frontend/track.py4
-rw-r--r--tests/frontend/version.py2
-rw-r--r--tests/frontend/workspace.py4
23 files changed, 31 insertions, 31 deletions
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
View Lorry Controller Status