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.

43 files changed, 4 insertions, 4 deletions

diff --git a/buildstream/plugintestutils/__init__.py b/buildstream/testing/__init__.py
index 19cb1bf9a..0dfc11f1c 100644
--- a/buildstream/plugintestutils/__init__.py
+++ b/buildstream/testing/__init__.py
@@ -69,7 +69,7 @@ def register_repo_kind(kind, cls):
     In addition, repo_kinds registred prior to
     `sourcetests_collection_hook` being called will be automatically
     used to test the basic behaviour of their associated source
-    plugins using the tests in `plugintestutils._sourcetests`.
+    plugins using the tests in `testing._sourcetests`.
 
     Args:
        kind (str): The kind of repo to create (a source plugin basename)
diff --git a/buildstream/plugintestutils/_sourcetests/__init__.py b/buildstream/testing/_sourcetests/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/plugintestutils/_sourcetests/__init__.py
+++ b/buildstream/testing/_sourcetests/__init__.py
diff --git a/buildstream/plugintestutils/_sourcetests/build_checkout.py b/buildstream/testing/_sourcetests/build_checkout.py
index 074be8429..3619d2b7e 100644
--- a/buildstream/plugintestutils/_sourcetests/build_checkout.py
+++ b/buildstream/testing/_sourcetests/build_checkout.py
@@ -22,8 +22,8 @@
 import os
 import pytest
 
-from buildstream.plugintestutils import create_repo, ALL_REPO_KINDS
-from buildstream.plugintestutils import cli  # pylint: disable=unused-import
+from buildstream.testing import create_repo, ALL_REPO_KINDS
+from buildstream.testing import cli  # pylint: disable=unused-import
 from buildstream import _yaml
 
 # Project directory
diff --git a/buildstream/plugintestutils/_sourcetests/fetch.py b/buildstream/testing/_sourcetests/fetch.py
index aaf92a14d..aaf92a14d 100644
--- a/buildstream/plugintestutils/_sourcetests/fetch.py
+++ b/buildstream/testing/_sourcetests/fetch.py
diff --git a/buildstream/plugintestutils/_sourcetests/mirror.py b/buildstream/testing/_sourcetests/mirror.py
index d682bb2ef..d682bb2ef 100644
--- a/buildstream/plugintestutils/_sourcetests/mirror.py
+++ b/buildstream/testing/_sourcetests/mirror.py
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/base.bst b/buildstream/testing/_sourcetests/project/elements/base.bst
index 428afa736..428afa736 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/base.bst
+++ b/buildstream/testing/_sourcetests/project/elements/base.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/base/base-alpine.bst b/buildstream/testing/_sourcetests/project/elements/base/base-alpine.bst
index c5833095d..c5833095d 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/base/base-alpine.bst
+++ b/buildstream/testing/_sourcetests/project/elements/base/base-alpine.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/import-bin.bst b/buildstream/testing/_sourcetests/project/elements/import-bin.bst
index a847c0c23..a847c0c23 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/import-bin.bst
+++ b/buildstream/testing/_sourcetests/project/elements/import-bin.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/import-dev.bst b/buildstream/testing/_sourcetests/project/elements/import-dev.bst
index 152a54667..152a54667 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/import-dev.bst
+++ b/buildstream/testing/_sourcetests/project/elements/import-dev.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/dependency/horsey.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/horsey.bst
index bd1ffae9c..bd1ffae9c 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/dependency/horsey.bst
+++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/horsey.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/dependency/pony.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/pony.bst
index 3c29b4ea1..3c29b4ea1 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/dependency/pony.bst
+++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/pony.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/dependency/zebry.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/zebry.bst
index 98447ab52..98447ab52 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/dependency/zebry.bst
+++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/zebry.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/0.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/0.bst
index a99be06a0..a99be06a0 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/0.bst
+++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/0.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/1.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/1.bst
index 82b507a62..82b507a62 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/1.bst
+++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/1.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/2.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/2.bst
index ee1afae20..ee1afae20 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/2.bst
+++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/2.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/3.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/3.bst
index 4c3a23dab..4c3a23dab 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/3.bst
+++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/3.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/4.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/4.bst
index b663a0b52..b663a0b52 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/4.bst
+++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/4.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/5.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/5.bst
index b9efcf71b..b9efcf71b 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/5.bst
+++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/5.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/6.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/6.bst
index 6c19d04e3..6c19d04e3 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/6.bst
+++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/6.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/7.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/7.bst
index 6805b3e6d..6805b3e6d 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/7.bst
+++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/7.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/8.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/8.bst
index b8d8964a0..b8d8964a0 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/8.bst
+++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/8.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/9.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/9.bst
index cc13bf3f0..cc13bf3f0 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/9.bst
+++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/9.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/run.bst b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/run.bst
index 9b3d2446c..9b3d2446c 100644
--- a/buildstream/plugintestutils/_sourcetests/project/elements/multiple_targets/order/run.bst
+++ b/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/run.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/files/bar b/buildstream/testing/_sourcetests/project/files/bar
index e69de29bb..e69de29bb 100644
--- a/buildstream/plugintestutils/_sourcetests/project/files/bar
+++ b/buildstream/testing/_sourcetests/project/files/bar
diff --git a/buildstream/plugintestutils/_sourcetests/project/files/bin-files/usr/bin/hello b/buildstream/testing/_sourcetests/project/files/bin-files/usr/bin/hello
index f534a4083..f534a4083 100755
--- a/buildstream/plugintestutils/_sourcetests/project/files/bin-files/usr/bin/hello
+++ b/buildstream/testing/_sourcetests/project/files/bin-files/usr/bin/hello
diff --git a/buildstream/plugintestutils/_sourcetests/project/files/dev-files/usr/include/pony.h b/buildstream/testing/_sourcetests/project/files/dev-files/usr/include/pony.h
index 40bd0c2e7..40bd0c2e7 100644
--- a/buildstream/plugintestutils/_sourcetests/project/files/dev-files/usr/include/pony.h
+++ b/buildstream/testing/_sourcetests/project/files/dev-files/usr/include/pony.h
diff --git a/buildstream/plugintestutils/_sourcetests/project/files/etc-files/etc/buildstream/config b/buildstream/testing/_sourcetests/project/files/etc-files/etc/buildstream/config
index 04204c7c9..04204c7c9 100644
--- a/buildstream/plugintestutils/_sourcetests/project/files/etc-files/etc/buildstream/config
+++ b/buildstream/testing/_sourcetests/project/files/etc-files/etc/buildstream/config
diff --git a/buildstream/plugintestutils/_sourcetests/project/files/foo b/buildstream/testing/_sourcetests/project/files/foo
index e69de29bb..e69de29bb 100644
--- a/buildstream/plugintestutils/_sourcetests/project/files/foo
+++ b/buildstream/testing/_sourcetests/project/files/foo
diff --git a/buildstream/plugintestutils/_sourcetests/project/files/source-bundle/llamas.txt b/buildstream/testing/_sourcetests/project/files/source-bundle/llamas.txt
index f98b24871..f98b24871 100644
--- a/buildstream/plugintestutils/_sourcetests/project/files/source-bundle/llamas.txt
+++ b/buildstream/testing/_sourcetests/project/files/source-bundle/llamas.txt
diff --git a/buildstream/plugintestutils/_sourcetests/project/files/sub-project/elements/import-etc.bst b/buildstream/testing/_sourcetests/project/files/sub-project/elements/import-etc.bst
index f0171990e..f0171990e 100644
--- a/buildstream/plugintestutils/_sourcetests/project/files/sub-project/elements/import-etc.bst
+++ b/buildstream/testing/_sourcetests/project/files/sub-project/elements/import-etc.bst
diff --git a/buildstream/plugintestutils/_sourcetests/project/files/sub-project/files/etc-files/etc/animal.conf b/buildstream/testing/_sourcetests/project/files/sub-project/files/etc-files/etc/animal.conf
index db8c36cba..db8c36cba 100644
--- a/buildstream/plugintestutils/_sourcetests/project/files/sub-project/files/etc-files/etc/animal.conf
+++ b/buildstream/testing/_sourcetests/project/files/sub-project/files/etc-files/etc/animal.conf
diff --git a/buildstream/plugintestutils/_sourcetests/project/files/sub-project/project.conf b/buildstream/testing/_sourcetests/project/files/sub-project/project.conf
index bbb8414a3..bbb8414a3 100644
--- a/buildstream/plugintestutils/_sourcetests/project/files/sub-project/project.conf
+++ b/buildstream/testing/_sourcetests/project/files/sub-project/project.conf
diff --git a/buildstream/plugintestutils/_sourcetests/project/project.conf b/buildstream/testing/_sourcetests/project/project.conf
index 05b68bfeb..05b68bfeb 100644
--- a/buildstream/plugintestutils/_sourcetests/project/project.conf
+++ b/buildstream/testing/_sourcetests/project/project.conf
diff --git a/buildstream/plugintestutils/_sourcetests/source_determinism.py b/buildstream/testing/_sourcetests/source_determinism.py
index 8597a7072..8597a7072 100644
--- a/buildstream/plugintestutils/_sourcetests/source_determinism.py
+++ b/buildstream/testing/_sourcetests/source_determinism.py
diff --git a/buildstream/plugintestutils/_sourcetests/track.py b/buildstream/testing/_sourcetests/track.py
index 668ea29e5..668ea29e5 100644
--- a/buildstream/plugintestutils/_sourcetests/track.py
+++ b/buildstream/testing/_sourcetests/track.py
diff --git a/buildstream/plugintestutils/_sourcetests/track_cross_junction.py b/buildstream/testing/_sourcetests/track_cross_junction.py
index ece3e0b8f..ece3e0b8f 100644
--- a/buildstream/plugintestutils/_sourcetests/track_cross_junction.py
+++ b/buildstream/testing/_sourcetests/track_cross_junction.py
diff --git a/buildstream/plugintestutils/_sourcetests/workspace.py b/buildstream/testing/_sourcetests/workspace.py
index 5218f8f1e..5218f8f1e 100644
--- a/buildstream/plugintestutils/_sourcetests/workspace.py
+++ b/buildstream/testing/_sourcetests/workspace.py
diff --git a/buildstream/plugintestutils/_utils/__init__.py b/buildstream/testing/_utils/__init__.py
index b419d72b7..b419d72b7 100644
--- a/buildstream/plugintestutils/_utils/__init__.py
+++ b/buildstream/testing/_utils/__init__.py
diff --git a/buildstream/plugintestutils/_utils/junction.py b/buildstream/testing/_utils/junction.py
index ca059eb8b..ca059eb8b 100644
--- a/buildstream/plugintestutils/_utils/junction.py
+++ b/buildstream/testing/_utils/junction.py
diff --git a/buildstream/plugintestutils/_utils/site.py b/buildstream/testing/_utils/site.py
index 54c5b467b..54c5b467b 100644
--- a/buildstream/plugintestutils/_utils/site.py
+++ b/buildstream/testing/_utils/site.py
diff --git a/buildstream/plugintestutils/integration.py b/buildstream/testing/integration.py
index e29f480ea..e29f480ea 100644
--- a/buildstream/plugintestutils/integration.py
+++ b/buildstream/testing/integration.py
diff --git a/buildstream/plugintestutils/repo.py b/buildstream/testing/repo.py
index e3293ea75..c1538685d 100644
--- a/buildstream/plugintestutils/repo.py
+++ b/buildstream/testing/repo.py
@@ -31,7 +31,7 @@ class Repo():
     Abstract class providing scaffolding for generating data to be
     used with various sources. Subclasses of Repo may be registered to
     run through the suite of generic source plugin tests provided in
-    buildstream.plugintestutils.
+    buildstream.testing.
 
     Args:
     directory (str): The base temp directory for the test
diff --git a/buildstream/plugintestutils/runcli.py b/buildstream/testing/runcli.py
index 72bdce09e..72bdce09e 100644
--- a/buildstream/plugintestutils/runcli.py
+++ b/buildstream/testing/runcli.py