summaryrefslogtreecommitdiff
path: root/tests/sandboxes
diff options
context:
space:
mode:
authorPhil Dawson <phildawson.0807@gmail.com>2019-02-08 16:28:05 +0000
committerPhil Dawson <phildawson.0807@gmail.com>2019-02-08 16:28:05 +0000
commit77ce0c1607d060eda098779228d5b0ab62ec04ef (patch)
treeff2b7c958ba18ab3a018d1917a7b9369bc82b8a9 /tests/sandboxes
parente61f471376d6d3ef2691abf3eee75d30999e7f05 (diff)
parentb4d4c4f59c12c9b500f83d8cd4381418e1124f67 (diff)
downloadbuildstream-77ce0c1607d060eda098779228d5b0ab62ec04ef.tar.gz
Merge branch 'phil/plugin-testing-api' into 'master'
Expose basic api for testing external plugins. Closes #847 See merge request BuildStream/buildstream!1075
Diffstat (limited to 'tests/sandboxes')
-rw-r--r--tests/sandboxes/missing-command.py2
-rw-r--r--tests/sandboxes/missing_dependencies.py2
-rw-r--r--tests/sandboxes/remote-exec-config.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/sandboxes/missing-command.py b/tests/sandboxes/missing-command.py
index 8f210bcec..ddf1c487f 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 tests.testutils import cli
+from buildstream.plugintestutils import cli
DATA_DIR = os.path.join(
diff --git a/tests/sandboxes/missing_dependencies.py b/tests/sandboxes/missing_dependencies.py
index d77674c64..19515a187 100644
--- a/tests/sandboxes/missing_dependencies.py
+++ b/tests/sandboxes/missing_dependencies.py
@@ -1,6 +1,6 @@
import os
import pytest
-from tests.testutils import cli
+from buildstream.plugintestutils 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 9cf0a8f08..9864f2591 100644
--- a/tests/sandboxes/remote-exec-config.py
+++ b/tests/sandboxes/remote-exec-config.py
@@ -6,7 +6,7 @@ import os
from buildstream import _yaml
from buildstream._exceptions import ErrorDomain, LoadErrorReason
-from tests.testutils.runcli import cli
+from buildstream.plugintestutils.runcli import cli
DATA_DIR = os.path.join(
os.path.dirname(os.path.realpath(__file__)),