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.

23 files changed, 31 insertions, 31 deletions

diff --git a/tests/integration/artifact.py b/tests/integration/artifact.py
index 0718de893..a5e1f4d77 100644
--- a/tests/integration/artifact.py
+++ b/tests/integration/artifact.py
@@ -25,7 +25,7 @@ import shutil
 import tempfile
 
 from buildstream import utils
-from buildstream.plugintestutils import cli_integration as cli
+from buildstream.testing import cli_integration as cli
 from tests.testutils import create_artifact_share
 from tests.testutils.site import HAVE_SANDBOX
 from buildstream._cas import CASCache
diff --git a/tests/integration/autotools.py b/tests/integration/autotools.py
index d9dcc10ed..80365b8ee 100644
--- a/tests/integration/autotools.py
+++ b/tests/integration/autotools.py
@@ -1,8 +1,8 @@
 import os
 import pytest
 
-from buildstream.plugintestutils import cli_integration as cli
-from buildstream.plugintestutils.integration import assert_contains
+from buildstream.testing import cli_integration as cli
+from buildstream.testing.integration import assert_contains
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/build-uid.py b/tests/integration/build-uid.py
index bb2e013c2..f2e50a3c7 100644
--- a/tests/integration/build-uid.py
+++ b/tests/integration/build-uid.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 
-from buildstream.plugintestutils import cli_integration as cli
+from buildstream.testing import cli_integration as cli
 from tests.testutils.site import HAVE_BWRAP, IS_LINUX, HAVE_SANDBOX
 
 
diff --git a/tests/integration/cachedfail.py b/tests/integration/cachedfail.py
index 34849f8bc..28174353d 100644
--- a/tests/integration/cachedfail.py
+++ b/tests/integration/cachedfail.py
@@ -3,7 +3,7 @@ import pytest
 
 from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain
-from buildstream.plugintestutils import cli_integration as cli
+from buildstream.testing import cli_integration as cli
 
 from tests.conftest import clean_platform_cache
 from tests.testutils import create_artifact_share
diff --git a/tests/integration/cmake.py b/tests/integration/cmake.py
index ddd8ce95d..a69b9cd80 100644
--- a/tests/integration/cmake.py
+++ b/tests/integration/cmake.py
@@ -1,8 +1,8 @@
 import os
 import pytest
 
-from buildstream.plugintestutils import cli_integration as cli
-from buildstream.plugintestutils.integration import assert_contains
+from buildstream.testing import cli_integration as cli
+from buildstream.testing.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 6f9e0ea7d..e510d9573 100644
--- a/tests/integration/compose-symlinks.py
+++ b/tests/integration/compose-symlinks.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 
-from buildstream.plugintestutils import cli_integration as cli
+from buildstream.testing import cli_integration as cli
 
 
 pytestmark = pytest.mark.integration
diff --git a/tests/integration/compose.py b/tests/integration/compose.py
index e0de38655..dab05fd9f 100644
--- a/tests/integration/compose.py
+++ b/tests/integration/compose.py
@@ -3,8 +3,8 @@ import pytest
 
 from buildstream import _yaml
 
-from buildstream.plugintestutils import cli_integration as cli
-from buildstream.plugintestutils.integration import walk_dir
+from buildstream.testing import cli_integration as cli
+from buildstream.testing.integration import walk_dir
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/import.py b/tests/integration/import.py
index 501f8aa9e..26c8cf6a0 100644
--- a/tests/integration/import.py
+++ b/tests/integration/import.py
@@ -3,8 +3,8 @@ import pytest
 
 from buildstream import _yaml
 
-from buildstream.plugintestutils import cli_integration as cli
-from buildstream.plugintestutils.integration import walk_dir
+from buildstream.testing import cli_integration as cli
+from buildstream.testing.integration import walk_dir
 
 
 pytestmark = pytest.mark.integration
diff --git a/tests/integration/make.py b/tests/integration/make.py
index 581d919e7..f59c2b0d6 100644
--- a/tests/integration/make.py
+++ b/tests/integration/make.py
@@ -1,8 +1,8 @@
 import os
 import pytest
 
-from buildstream.plugintestutils import cli_integration as cli
-from buildstream.plugintestutils.integration import assert_contains
+from buildstream.testing import cli_integration as cli
+from buildstream.testing.integration import assert_contains
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/manual.py b/tests/integration/manual.py
index 76ea1dc66..0ba650bde 100644
--- a/tests/integration/manual.py
+++ b/tests/integration/manual.py
@@ -3,7 +3,7 @@ import pytest
 
 from buildstream import _yaml
 
-from buildstream.plugintestutils import cli_integration as cli
+from buildstream.testing 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 3697d0bf7..2211ea468 100644
--- a/tests/integration/messages.py
+++ b/tests/integration/messages.py
@@ -22,7 +22,7 @@ import pytest
 
 from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain
-from buildstream.plugintestutils import cli_integration as cli
+from buildstream.testing 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 a3f363bc8..9ef163125 100644
--- a/tests/integration/pip_element.py
+++ b/tests/integration/pip_element.py
@@ -4,8 +4,8 @@ import pytest
 
 from buildstream import _yaml
 
-from buildstream.plugintestutils import cli_integration as cli
-from buildstream.plugintestutils.integration import assert_contains
+from buildstream.testing import cli_integration as cli
+from buildstream.testing.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 6ee76005c..645dad444 100644
--- a/tests/integration/pip_source.py
+++ b/tests/integration/pip_source.py
@@ -3,8 +3,8 @@ import pytest
 
 from buildstream import _yaml
 
-from buildstream.plugintestutils import cli_integration as cli
-from buildstream.plugintestutils.integration import assert_contains
+from buildstream.testing import cli_integration as cli
+from buildstream.testing.integration import assert_contains
 from tests.testutils.python_repo import setup_pypi_repo
 from tests.testutils.site import HAVE_SANDBOX
 
diff --git a/tests/integration/pullbuildtrees.py b/tests/integration/pullbuildtrees.py
index bdbcad911..91acff4a3 100644
--- a/tests/integration/pullbuildtrees.py
+++ b/tests/integration/pullbuildtrees.py
@@ -8,7 +8,7 @@ from tests.testutils import create_artifact_share
 from tests.testutils.site import HAVE_SANDBOX
 
 from buildstream import utils
-from buildstream.plugintestutils import cli, cli_integration as cli2
+from buildstream.testing import cli, cli_integration as cli2
 from buildstream._cas import CASCache
 from buildstream._exceptions import ErrorDomain, LoadErrorReason
 
diff --git a/tests/integration/sandbox-bwrap.py b/tests/integration/sandbox-bwrap.py
index 29227501c..549de4ed0 100644
--- a/tests/integration/sandbox-bwrap.py
+++ b/tests/integration/sandbox-bwrap.py
@@ -3,7 +3,7 @@ import pytest
 
 from buildstream._exceptions import ErrorDomain
 
-from buildstream.plugintestutils import cli_integration as cli
+from buildstream.testing import cli_integration as cli
 from tests.testutils.site import HAVE_BWRAP, HAVE_BWRAP_JSON_STATUS
 
 
diff --git a/tests/integration/script.py b/tests/integration/script.py
index 1500af724..acc752f48 100644
--- a/tests/integration/script.py
+++ b/tests/integration/script.py
@@ -2,7 +2,7 @@ import os
 import pytest
 
 from buildstream import _yaml
-from buildstream.plugintestutils import cli_integration as cli
+from buildstream.testing 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 fb01f45ea..a9fb4855a 100644
--- a/tests/integration/shell.py
+++ b/tests/integration/shell.py
@@ -2,7 +2,7 @@ import os
 import pytest
 
 from buildstream import _yaml
-from buildstream.plugintestutils import cli_integration as cli
+from buildstream.testing import cli_integration as cli
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/shellbuildtrees.py b/tests/integration/shellbuildtrees.py
index c12a0d404..3d59c78b9 100644
--- a/tests/integration/shellbuildtrees.py
+++ b/tests/integration/shellbuildtrees.py
@@ -4,7 +4,7 @@ import shutil
 
 from tests.testutils import create_artifact_share
 from tests.testutils.site import HAVE_SANDBOX
-from buildstream.plugintestutils import cli, cli_integration
+from buildstream.testing import cli, cli_integration
 from buildstream._exceptions import ErrorDomain
 
 
diff --git a/tests/integration/sockets.py b/tests/integration/sockets.py
index 17c3becea..af09c391b 100644
--- a/tests/integration/sockets.py
+++ b/tests/integration/sockets.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 
-from buildstream.plugintestutils import cli_integration as cli
+from buildstream.testing import cli_integration as cli
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/source-determinism.py b/tests/integration/source-determinism.py
index 2f63a4af9..5bb0941d1 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
-from buildstream.plugintestutils import cli_integration as cli
-from buildstream.plugintestutils import create_repo
+from buildstream.testing import cli_integration as cli
+from buildstream.testing import create_repo
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/stack.py b/tests/integration/stack.py
index e75c6a450..9cc917e0e 100644
--- a/tests/integration/stack.py
+++ b/tests/integration/stack.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 
-from buildstream.plugintestutils import cli_integration as cli
+from buildstream.testing 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 5752281de..02238aebc 100644
--- a/tests/integration/symlinks.py
+++ b/tests/integration/symlinks.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 
-from buildstream.plugintestutils import cli_integration as cli
+from buildstream.testing import cli_integration as cli
 from tests.testutils.site import HAVE_SANDBOX
 
 
diff --git a/tests/integration/workspace.py b/tests/integration/workspace.py
index 8ec6db3c8..4ee0050d7 100644
--- a/tests/integration/workspace.py
+++ b/tests/integration/workspace.py
@@ -2,7 +2,7 @@ import os
 import pytest
 
 from buildstream import _yaml
-from buildstream.plugintestutils import cli_integration as cli
+from buildstream.testing import cli_integration as cli
 from tests.testutils.site import HAVE_SANDBOX