Merge branch 'phil/plugin-testing-api' into 'master'

Expose basic api for testing external plugins.

Closes #847

See merge request BuildStream/buildstream!1075

23 files changed, 42 insertions, 43 deletions

diff --git a/tests/integration/artifact.py b/tests/integration/artifact.py
index 2e12e712c..459241209 100644
--- a/tests/integration/artifact.py
+++ b/tests/integration/artifact.py
@@ -21,7 +21,7 @@
 import os
 import pytest
 
-from tests.testutils import cli_integration as cli
+from buildstream.plugintestutils import cli_integration as cli
 
 
 pytestmark = pytest.mark.integration
diff --git a/tests/integration/autotools.py b/tests/integration/autotools.py
index b1d33f497..3ed0533cf 100644
--- a/tests/integration/autotools.py
+++ b/tests/integration/autotools.py
@@ -1,8 +1,8 @@
 import os
 import pytest
 
-from tests.testutils import cli_integration as cli
-from tests.testutils.integration import assert_contains
+from buildstream.plugintestutils import cli_integration as cli
+from buildstream.plugintestutils.integration import assert_contains
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/build-tree.py b/tests/integration/build-tree.py
index bacbf1cc7..98bb5b1e8 100644
--- a/tests/integration/build-tree.py
+++ b/tests/integration/build-tree.py
@@ -2,8 +2,9 @@ import os
 import pytest
 import shutil
 
-from tests.testutils import cli, cli_integration, create_artifact_share
+from tests.testutils import create_artifact_share
 from tests.testutils.site import HAVE_SANDBOX
+from buildstream.plugintestutils import cli, cli_integration
 from buildstream._exceptions import ErrorDomain
 
 
diff --git a/tests/integration/build-uid.py b/tests/integration/build-uid.py
index 06779ee20..88b887b5e 100644
--- a/tests/integration/build-uid.py
+++ b/tests/integration/build-uid.py
@@ -3,8 +3,8 @@ import pytest
 
 from buildstream import _yaml
 
-from tests.testutils import cli_integration as cli
-from tests.testutils.integration import assert_contains
+from buildstream.plugintestutils import cli_integration as cli
+from buildstream.plugintestutils.integration import assert_contains
 from tests.testutils.site import HAVE_BWRAP, IS_LINUX, HAVE_SANDBOX
 
 
diff --git a/tests/integration/cachedfail.py b/tests/integration/cachedfail.py
index 08dbf81e1..5335ff5ed 100644
--- a/tests/integration/cachedfail.py
+++ b/tests/integration/cachedfail.py
@@ -3,10 +3,10 @@ import pytest
 
 from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain
+from buildstream.plugintestutils import cli_integration as cli
 
 from conftest import clean_platform_cache
-
-from tests.testutils import cli_integration as cli, create_artifact_share
+from tests.testutils import create_artifact_share
 from tests.testutils.site import HAVE_BWRAP, IS_LINUX, HAVE_SANDBOX
 
 
diff --git a/tests/integration/cmake.py b/tests/integration/cmake.py
index 7d03e291d..51e215655 100644
--- a/tests/integration/cmake.py
+++ b/tests/integration/cmake.py
@@ -1,8 +1,8 @@
 import os
 import pytest
 
-from tests.testutils import cli_integration as cli
-from tests.testutils.integration import assert_contains
+from buildstream.plugintestutils import cli_integration as cli
+from buildstream.plugintestutils.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 2599d8bcd..c6027bf2b 100644
--- a/tests/integration/compose-symlinks.py
+++ b/tests/integration/compose-symlinks.py
@@ -5,8 +5,8 @@ import pytest
 
 from buildstream import _yaml
 
-from tests.testutils import cli_integration as cli
-from tests.testutils.integration import walk_dir
+from buildstream.plugintestutils import cli_integration as cli
+from buildstream.plugintestutils.integration import walk_dir
 
 
 pytestmark = pytest.mark.integration
diff --git a/tests/integration/compose.py b/tests/integration/compose.py
index 077d5eea0..386e08438 100644
--- a/tests/integration/compose.py
+++ b/tests/integration/compose.py
@@ -5,8 +5,8 @@ import pytest
 
 from buildstream import _yaml
 
-from tests.testutils import cli_integration as cli
-from tests.testutils.integration import walk_dir
+from buildstream.plugintestutils import cli_integration as cli
+from buildstream.plugintestutils.integration import walk_dir
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/import.py b/tests/integration/import.py
index 842640515..deef66bc1 100644
--- a/tests/integration/import.py
+++ b/tests/integration/import.py
@@ -3,8 +3,8 @@ import pytest
 
 from buildstream import _yaml
 
-from tests.testutils import cli_integration as cli
-from tests.testutils.integration import walk_dir
+from buildstream.plugintestutils import cli_integration as cli
+from buildstream.plugintestutils.integration import walk_dir
 
 
 pytestmark = pytest.mark.integration
diff --git a/tests/integration/make.py b/tests/integration/make.py
index 12c027b61..a76fe9a41 100644
--- a/tests/integration/make.py
+++ b/tests/integration/make.py
@@ -1,8 +1,8 @@
 import os
 import pytest
 
-from tests.testutils import cli_integration as cli
-from tests.testutils.integration import assert_contains
+from buildstream.plugintestutils import cli_integration as cli
+from buildstream.plugintestutils.integration import assert_contains
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/manual.py b/tests/integration/manual.py
index b9f09e25c..97cbec537 100644
--- a/tests/integration/manual.py
+++ b/tests/integration/manual.py
@@ -3,7 +3,7 @@ import pytest
 
 from buildstream import _yaml
 
-from tests.testutils import cli_integration as cli
+from buildstream.plugintestutils 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 03c922472..7f4194e0f 100644
--- a/tests/integration/messages.py
+++ b/tests/integration/messages.py
@@ -22,8 +22,7 @@ import pytest
 
 from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain
-
-from tests.testutils import cli_integration as cli
+from buildstream.plugintestutils 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 807123620..48ca13bf5 100644
--- a/tests/integration/pip_element.py
+++ b/tests/integration/pip_element.py
@@ -4,8 +4,8 @@ import pytest
 
 from buildstream import _yaml
 
-from tests.testutils import cli_integration as cli
-from tests.testutils.integration import assert_contains
+from buildstream.plugintestutils import cli_integration as cli
+from buildstream.plugintestutils.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 d43b380aa..993b3a182 100644
--- a/tests/integration/pip_source.py
+++ b/tests/integration/pip_source.py
@@ -3,9 +3,9 @@ import pytest
 
 from buildstream import _yaml
 
-from tests.testutils import cli_integration as cli
+from buildstream.plugintestutils import cli_integration as cli
+from buildstream.plugintestutils.integration import assert_contains
 from tests.testutils.python_repo import setup_pypi_repo
-from tests.testutils.integration import assert_contains
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/pullbuildtrees.py b/tests/integration/pullbuildtrees.py
index ca6c40f94..24fac7e00 100644
--- a/tests/integration/pullbuildtrees.py
+++ b/tests/integration/pullbuildtrees.py
@@ -2,9 +2,12 @@ import os
 import shutil
 import pytest
 
-from tests.testutils import cli, cli_integration as cli2, create_artifact_share
-from tests.testutils.integration import assert_contains
+from tests.testutils import create_artifact_share
 from tests.testutils.site import HAVE_SANDBOX
+
+from buildstream.plugintestutils.integration import assert_contains
+from buildstream.plugintestutils import cli, cli_integration as cli2
+from buildstream.plugintestutils.integration import assert_contains
 from buildstream._exceptions import ErrorDomain, LoadErrorReason
 
 
diff --git a/tests/integration/sandbox-bwrap.py b/tests/integration/sandbox-bwrap.py
index 66e9f5b57..2c939e9be 100644
--- a/tests/integration/sandbox-bwrap.py
+++ b/tests/integration/sandbox-bwrap.py
@@ -3,8 +3,8 @@ import pytest
 
 from buildstream._exceptions import ErrorDomain
 
-from tests.testutils import cli_integration as cli
-from tests.testutils.integration import assert_contains
+from buildstream.plugintestutils import cli_integration as cli
+from buildstream.plugintestutils.integration import assert_contains
 from tests.testutils.site import HAVE_BWRAP, HAVE_BWRAP_JSON_STATUS
 
 
diff --git a/tests/integration/script.py b/tests/integration/script.py
index 446a63f3d..0297a3f0a 100644
--- a/tests/integration/script.py
+++ b/tests/integration/script.py
@@ -2,8 +2,7 @@ import os
 import pytest
 
 from buildstream import _yaml
-
-from tests.testutils import cli_integration as cli
+from buildstream.plugintestutils 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 9b35db883..d1a551f53 100644
--- a/tests/integration/shell.py
+++ b/tests/integration/shell.py
@@ -3,8 +3,7 @@ import pytest
 
 from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain
-
-from tests.testutils import cli_integration as cli
+from buildstream.plugintestutils import cli_integration as cli
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/sockets.py b/tests/integration/sockets.py
index 30cf622cf..fc2fb2b92 100644
--- a/tests/integration/sockets.py
+++ b/tests/integration/sockets.py
@@ -2,9 +2,8 @@ import os
 import pytest
 
 from buildstream import _yaml
-
-from tests.testutils import cli_integration as cli
-from tests.testutils.integration import assert_contains
+from buildstream.plugintestutils import cli_integration as cli
+from buildstream.plugintestutils.integration import assert_contains
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/source-determinism.py b/tests/integration/source-determinism.py
index 6be6a4d4a..f7b2bf2ac 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, utils
+from buildstream.plugintestutils import cli_integration as cli
 from tests.testutils import create_repo, ALL_REPO_KINDS
-from tests.testutils import cli_integration as cli
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/stack.py b/tests/integration/stack.py
index 1b8d38198..d5208d7be 100644
--- a/tests/integration/stack.py
+++ b/tests/integration/stack.py
@@ -2,8 +2,7 @@ import os
 import pytest
 
 from buildstream import _yaml
-
-from tests.testutils import cli_integration as cli
+from buildstream.plugintestutils 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 c45c81177..22ff527f8 100644
--- a/tests/integration/symlinks.py
+++ b/tests/integration/symlinks.py
@@ -4,8 +4,8 @@ import pytest
 
 from buildstream import _yaml
 
-from tests.testutils import cli_integration as cli
-from tests.testutils.integration import assert_contains
+from buildstream.plugintestutils import cli_integration as cli
+from buildstream.plugintestutils.integration import assert_contains
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/workspace.py b/tests/integration/workspace.py
index ee1d575bf..f1d8d6fcd 100644
--- a/tests/integration/workspace.py
+++ b/tests/integration/workspace.py
@@ -2,9 +2,9 @@ import os
 import pytest
 
 from buildstream import _yaml
-from tests.testutils import cli_integration as cli
+from buildstream.plugintestutils import cli_integration as cli
 from tests.testutils.site import HAVE_SANDBOX
-from tests.testutils.integration import walk_dir
+from buildstream.plugintestutils.integration import walk_dir
 
 
 pytestmark = pytest.mark.integration