summaryrefslogtreecommitdiff
path: root/tests/sourcecache
diff options
context:
space:
mode:
authorPhil Dawson <phil.dawson@codethink.co.uk>2019-04-15 11:02:33 +0100
committerPhil Dawson <phil.dawson@codethink.co.uk>2019-04-16 14:25:40 +0100
commit97bbedbef15fc9edea5b04f66a30ec788da7f130 (patch)
tree109707eaf268fbf104e3ec2cdad337f2fde81c3d /tests/sourcecache
parent9d7d803bbefed364ad58b4b5b5305f4e210bb5e1 (diff)
downloadbuildstream-97bbedbef15fc9edea5b04f66a30ec788da7f130.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.
Diffstat (limited to 'tests/sourcecache')
-rw-r--r--tests/sourcecache/config.py2
-rw-r--r--tests/sourcecache/fetch.py4
-rw-r--r--tests/sourcecache/push.py4
-rw-r--r--tests/sourcecache/source-checkout.py2
-rw-r--r--tests/sourcecache/staging.py2
-rw-r--r--tests/sourcecache/workspace.py2
6 files changed, 8 insertions, 8 deletions
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