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.

17 files changed, 19 insertions, 19 deletions

diff --git a/tests/format/assertion.py b/tests/format/assertion.py
index cfab105b6..7e87977cb 100644
--- a/tests/format/assertion.py
+++ b/tests/format/assertion.py
@@ -4,7 +4,7 @@
 import os
 import pytest
 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
 
 # Project directory
 DATA_DIR = os.path.join(
diff --git a/tests/format/dependencies.py b/tests/format/dependencies.py
index 780eac73e..15b6e1f4a 100644
--- a/tests/format/dependencies.py
+++ b/tests/format/dependencies.py
@@ -5,7 +5,7 @@ import os
 import pytest
 
 from buildstream._exceptions import ErrorDomain, LoadErrorReason
-from buildstream.plugintestutils import cli  # pylint: disable=unused-import
+from buildstream.testing import cli  # pylint: disable=unused-import
 
 DATA_DIR = os.path.dirname(os.path.realpath(__file__))
 
diff --git a/tests/format/include.py b/tests/format/include.py
index 73f8092c5..bfadce7ed 100644
--- a/tests/format/include.py
+++ b/tests/format/include.py
@@ -6,8 +6,8 @@ import textwrap
 import pytest
 from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain, LoadErrorReason
-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 generate_junction
 
 
diff --git a/tests/format/junctions.py b/tests/format/junctions.py
index 94562cb4e..30891433b 100644
--- a/tests/format/junctions.py
+++ b/tests/format/junctions.py
@@ -8,8 +8,8 @@ import pytest
 
 from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain, LoadErrorReason
-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.site import HAVE_GIT
 
 
diff --git a/tests/format/listdirectiveerrors.py b/tests/format/listdirectiveerrors.py
index ec2429dd5..269b521a4 100644
--- a/tests/format/listdirectiveerrors.py
+++ b/tests/format/listdirectiveerrors.py
@@ -4,7 +4,7 @@
 import os
 import pytest
 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
 
 # Project directory
 DATA_DIR = os.path.dirname(os.path.realpath(__file__))
diff --git a/tests/format/optionarch.py b/tests/format/optionarch.py
index a7d38c8be..a35ac685d 100644
--- a/tests/format/optionarch.py
+++ b/tests/format/optionarch.py
@@ -7,7 +7,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
 
 from tests.testutils import override_platform_uname
 
diff --git a/tests/format/optionbool.py b/tests/format/optionbool.py
index 40f8dfb33..0d1ee601e 100644
--- a/tests/format/optionbool.py
+++ b/tests/format/optionbool.py
@@ -5,7 +5,7 @@ import os
 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
 
 # Project directory
 DATA_DIR = os.path.dirname(os.path.realpath(__file__))
diff --git a/tests/format/optioneltmask.py b/tests/format/optioneltmask.py
index 08f002b58..d33b5771c 100644
--- a/tests/format/optioneltmask.py
+++ b/tests/format/optioneltmask.py
@@ -5,7 +5,7 @@ import os
 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
 
 # Project directory
 DATA_DIR = os.path.dirname(os.path.realpath(__file__))
diff --git a/tests/format/optionenum.py b/tests/format/optionenum.py
index d729cbfee..b8a96b0c2 100644
--- a/tests/format/optionenum.py
+++ b/tests/format/optionenum.py
@@ -5,7 +5,7 @@ import os
 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
 
 # Project directory
 DATA_DIR = os.path.dirname(os.path.realpath(__file__))
diff --git a/tests/format/optionexports.py b/tests/format/optionexports.py
index 8ad063e74..5df7522b5 100644
--- a/tests/format/optionexports.py
+++ b/tests/format/optionexports.py
@@ -4,7 +4,7 @@
 import os
 import pytest
 from buildstream import _yaml
-from buildstream.plugintestutils.runcli import cli  # pylint: disable=unused-import
+from buildstream.testing.runcli import cli  # pylint: disable=unused-import
 
 # Project directory
 DATA_DIR = os.path.dirname(os.path.realpath(__file__))
diff --git a/tests/format/optionflags.py b/tests/format/optionflags.py
index fe61870d7..e28c54236 100644
--- a/tests/format/optionflags.py
+++ b/tests/format/optionflags.py
@@ -5,7 +5,7 @@ import os
 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
 
 # Project directory
 DATA_DIR = os.path.dirname(os.path.realpath(__file__))
diff --git a/tests/format/optionos.py b/tests/format/optionos.py
index 6856fd69c..57277b106 100644
--- a/tests/format/optionos.py
+++ b/tests/format/optionos.py
@@ -7,7 +7,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
 
 from tests.testutils import override_platform_uname
 
diff --git a/tests/format/optionoverrides.py b/tests/format/optionoverrides.py
index 2e4d26a16..60d02b3a3 100644
--- a/tests/format/optionoverrides.py
+++ b/tests/format/optionoverrides.py
@@ -4,7 +4,7 @@
 import os
 import pytest
 from buildstream import _yaml
-from buildstream.plugintestutils.runcli import cli  # pylint: disable=unused-import
+from buildstream.testing.runcli import cli  # pylint: disable=unused-import
 
 # Project directory
 DATA_DIR = os.path.dirname(os.path.realpath(__file__))
diff --git a/tests/format/options.py b/tests/format/options.py
index c9f29d64d..3a8210dc3 100644
--- a/tests/format/options.py
+++ b/tests/format/options.py
@@ -5,7 +5,7 @@ import os
 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
 
 # Project directory
 DATA_DIR = os.path.join(
diff --git a/tests/format/project.py b/tests/format/project.py
index 5813bb389..fbb742d47 100644
--- a/tests/format/project.py
+++ b/tests/format/project.py
@@ -5,7 +5,7 @@ import os
 import pytest
 from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain, LoadErrorReason
-from buildstream.plugintestutils import cli  # pylint: disable=unused-import
+from buildstream.testing import cli  # pylint: disable=unused-import
 
 from tests.testutils import filetypegenerator
 
diff --git a/tests/format/projectoverrides.py b/tests/format/projectoverrides.py
index 60851b9d5..4b0c3f4d0 100644
--- a/tests/format/projectoverrides.py
+++ b/tests/format/projectoverrides.py
@@ -4,7 +4,7 @@
 import os
 import pytest
 from buildstream import _yaml
-from buildstream.plugintestutils.runcli import cli  # pylint: disable=unused-import
+from buildstream.testing.runcli import cli  # pylint: disable=unused-import
 
 # Project directory
 DATA_DIR = os.path.join(
diff --git a/tests/format/variables.py b/tests/format/variables.py
index b62de7460..87e3b2903 100644
--- a/tests/format/variables.py
+++ b/tests/format/variables.py
@@ -8,7 +8,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
 
 
 # Project directory