summaryrefslogtreecommitdiff
path: root/tests/artifactcache
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/artifactcache
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/artifactcache')
-rw-r--r--tests/artifactcache/cache_size.py2
-rw-r--r--tests/artifactcache/config.py2
-rw-r--r--tests/artifactcache/expiry.py2
-rw-r--r--tests/artifactcache/junctions.py2
-rw-r--r--tests/artifactcache/pull.py2
-rw-r--r--tests/artifactcache/push.py2
6 files changed, 6 insertions, 6 deletions
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