tests: Remove unused importsremove-dead-code

43 files changed, 15 insertions, 69 deletions

diff --git a/tests/artifactcache/cache_size.py b/tests/artifactcache/cache_size.py
index 234317c72..104c43ce0 100644
--- a/tests/artifactcache/cache_size.py
+++ b/tests/artifactcache/cache_size.py
@@ -1,5 +1,4 @@
 import os
-import pytest
 from unittest import mock
 
 from buildstream import _yaml
diff --git a/tests/artifactcache/expiry.py b/tests/artifactcache/expiry.py
index 25e67414e..20e8cbda2 100644
--- a/tests/artifactcache/expiry.py
+++ b/tests/artifactcache/expiry.py
@@ -23,7 +23,6 @@ from unittest import mock
 
 import pytest
 
-from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain, LoadErrorReason
 from buildstream.plugintestutils import cli
 
diff --git a/tests/artifactcache/pull.py b/tests/artifactcache/pull.py
index 3113061ca..3e05bcecf 100644
--- a/tests/artifactcache/pull.py
+++ b/tests/artifactcache/pull.py
@@ -1,4 +1,3 @@
-import hashlib
 import multiprocessing
 import os
 import signal
diff --git a/tests/artifactcache/push.py b/tests/artifactcache/push.py
index a122c3c70..18d6d80bc 100644
--- a/tests/artifactcache/push.py
+++ b/tests/artifactcache/push.py
@@ -4,7 +4,6 @@ import signal
 
 import pytest
 
-from pluginbase import PluginBase
 from buildstream import _yaml, _signals, utils
 from buildstream._context import Context
 from buildstream._project import Project
diff --git a/tests/elements/filter.py b/tests/elements/filter.py
index ec9c8d627..a166b820c 100644
--- a/tests/elements/filter.py
+++ b/tests/elements/filter.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 import shutil
-from tests.testutils import create_repo, ALL_REPO_KINDS
+from tests.testutils import create_repo
 from buildstream.plugintestutils import cli
 from buildstream._exceptions import ErrorDomain
 from buildstream import _yaml
diff --git a/tests/examples/integration-commands.py b/tests/examples/integration-commands.py
index 72869dde1..bbcaafbfd 100644
--- a/tests/examples/integration-commands.py
+++ b/tests/examples/integration-commands.py
@@ -2,7 +2,6 @@ import os
 import pytest
 
 from buildstream.plugintestutils import cli_integration as cli
-from buildstream.plugintestutils.integration import assert_contains
 from tests.testutils.site import HAVE_BWRAP, IS_LINUX, MACHINE_ARCH
 
 
diff --git a/tests/examples/junctions.py b/tests/examples/junctions.py
index e05fbf322..777bf71a0 100644
--- a/tests/examples/junctions.py
+++ b/tests/examples/junctions.py
@@ -2,7 +2,6 @@ import os
 import pytest
 
 from buildstream.plugintestutils import cli_integration as cli
-from buildstream.plugintestutils.integration import assert_contains
 from tests.testutils.site import IS_LINUX, HAVE_BWRAP, MACHINE_ARCH
 
 pytestmark = pytest.mark.integration
diff --git a/tests/examples/running-commands.py b/tests/examples/running-commands.py
index 41a0e4cf0..677b14654 100644
--- a/tests/examples/running-commands.py
+++ b/tests/examples/running-commands.py
@@ -2,7 +2,6 @@ import os
 import pytest
 
 from buildstream.plugintestutils import cli_integration as cli
-from buildstream.plugintestutils.integration import assert_contains
 from tests.testutils.site import IS_LINUX, HAVE_BWRAP, MACHINE_ARCH
 
 
diff --git a/tests/format/junctions.py b/tests/format/junctions.py
index 2c200b039..0c94bb51a 100644
--- a/tests/format/junctions.py
+++ b/tests/format/junctions.py
@@ -2,7 +2,7 @@ import os
 import pytest
 import shutil
 
-from buildstream import _yaml, ElementError
+from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain, LoadErrorReason
 from buildstream.plugintestutils import cli
 from tests.testutils import create_repo
diff --git a/tests/frontend/configurable_warnings.py b/tests/frontend/configurable_warnings.py
index 042874529..594c5a8e1 100644
--- a/tests/frontend/configurable_warnings.py
+++ b/tests/frontend/configurable_warnings.py
@@ -2,7 +2,7 @@ import pytest
 import os
 
 from buildstream.plugin import CoreWarnings
-from buildstream._exceptions import ErrorDomain, LoadErrorReason
+from buildstream._exceptions import ErrorDomain
 from buildstream import _yaml
 from buildstream.plugintestutils.runcli import cli
 
diff --git a/tests/frontend/consistencyerror/plugins/consistencybug.py b/tests/frontend/consistencyerror/plugins/consistencybug.py
index 39eeaa852..3c6fb46f3 100644
--- a/tests/frontend/consistencyerror/plugins/consistencybug.py
+++ b/tests/frontend/consistencyerror/plugins/consistencybug.py
@@ -1,4 +1,4 @@
-from buildstream import Source, SourceError, Consistency
+from buildstream import Source
 
 
 class ConsistencyBugSource(Source):
diff --git a/tests/frontend/consistencyerror/plugins/consistencyerror.py b/tests/frontend/consistencyerror/plugins/consistencyerror.py
index 381e9e8f1..fe2037fc6 100644
--- a/tests/frontend/consistencyerror/plugins/consistencyerror.py
+++ b/tests/frontend/consistencyerror/plugins/consistencyerror.py
@@ -1,4 +1,4 @@
-from buildstream import Source, SourceError, Consistency
+from buildstream import Source, SourceError
 
 
 class ConsistencyErrorSource(Source):
diff --git a/tests/frontend/logging.py b/tests/frontend/logging.py
index b919a99b6..6ad792dc9 100644
--- a/tests/frontend/logging.py
+++ b/tests/frontend/logging.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 import re
-from tests.testutils import create_repo, ALL_REPO_KINDS
+from tests.testutils import create_repo
 
 from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain
diff --git a/tests/frontend/project/sources/fetch_source.py b/tests/frontend/project/sources/fetch_source.py
index 10e89960c..d454f69e0 100644
--- a/tests/frontend/project/sources/fetch_source.py
+++ b/tests/frontend/project/sources/fetch_source.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from buildstream import Source, Consistency, SourceError, SourceFetcher
 
diff --git a/tests/frontend/push.py b/tests/frontend/push.py
index 107af9d8c..b573a7e41 100644
--- a/tests/frontend/push.py
+++ b/tests/frontend/push.py
@@ -26,7 +26,6 @@ import pytest
 from buildstream._exceptions import ErrorDomain
 from buildstream.plugintestutils import cli
 from tests.testutils import create_artifact_share, create_element_size, generate_junction, wait_for_cache_granularity
-from . import configure_project
 
 
 # Project directory
diff --git a/tests/frontend/source_checkout.py b/tests/frontend/source_checkout.py
index 1a83ba76e..8466767f9 100644
--- a/tests/frontend/source_checkout.py
+++ b/tests/frontend/source_checkout.py
@@ -1,12 +1,11 @@
 import os
 import pytest
 import tarfile
-from pathlib import Path
 
 from buildstream.plugintestutils import cli
 
 from buildstream import utils, _yaml
-from buildstream._exceptions import ErrorDomain, LoadErrorReason
+from buildstream._exceptions import ErrorDomain
 
 # Project directory
 DATA_DIR = os.path.join(
diff --git a/tests/frontend/workspace.py b/tests/frontend/workspace.py
index 722512d6d..0e834912c 100644
--- a/tests/frontend/workspace.py
+++ b/tests/frontend/workspace.py
@@ -29,13 +29,12 @@ import stat
 import pytest
 import shutil
 import subprocess
-from ruamel.yaml.comments import CommentedSet
 from tests.testutils import create_repo, ALL_REPO_KINDS, wait_for_cache_granularity
 from tests.testutils import create_artifact_share, create_element_size
 
 from buildstream.plugintestutils import cli
 from buildstream import _yaml
-from buildstream._exceptions import ErrorDomain, LoadError, LoadErrorReason
+from buildstream._exceptions import ErrorDomain, LoadErrorReason
 from buildstream._workspaces import BST_WORKSPACE_FORMAT_VERSION
 
 repo_kinds = [(kind) for kind in ALL_REPO_KINDS]
diff --git a/tests/frontend/yamlcache.py b/tests/frontend/yamlcache.py
index 99b5d71c3..81514117e 100644
--- a/tests/frontend/yamlcache.py
+++ b/tests/frontend/yamlcache.py
@@ -1,10 +1,9 @@
 import os
 import pytest
-import hashlib
 import tempfile
 from ruamel import yaml
 
-from tests.testutils import generate_junction, create_element_size, create_repo
+from tests.testutils import generate_junction, create_element_size
 from buildstream.plugintestutils import cli
 from buildstream import _yaml
 from buildstream._yamlcache import YamlCache
diff --git a/tests/integration/artifact.py b/tests/integration/artifact.py
index 58e58bdcf..949d23c70 100644
--- a/tests/integration/artifact.py
+++ b/tests/integration/artifact.py
@@ -29,7 +29,6 @@ from buildstream.plugintestutils import cli_integration as cli
 from tests.testutils import create_artifact_share
 from tests.testutils.site import HAVE_SANDBOX
 from buildstream._cas import CASCache
-from buildstream._exceptions import ErrorDomain
 
 pytestmark = pytest.mark.integration
 
diff --git a/tests/integration/build-uid.py b/tests/integration/build-uid.py
index cfc2015e4..c5e213085 100644
--- a/tests/integration/build-uid.py
+++ b/tests/integration/build-uid.py
@@ -1,10 +1,7 @@
 import os
 import pytest
 
-from buildstream import _yaml
-
 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/compose-symlinks.py b/tests/integration/compose-symlinks.py
index aa943deff..ee7689e6e 100644
--- a/tests/integration/compose-symlinks.py
+++ b/tests/integration/compose-symlinks.py
@@ -1,12 +1,7 @@
-import io
 import os
-import sys
 import pytest
 
-from buildstream import _yaml
-
 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 0d59e793b..d15821d79 100644
--- a/tests/integration/compose.py
+++ b/tests/integration/compose.py
@@ -1,6 +1,4 @@
-import io
 import os
-import sys
 import pytest
 
 from buildstream import _yaml
diff --git a/tests/integration/pip_element.py b/tests/integration/pip_element.py
index e4277d24b..d49e80d8d 100644
--- a/tests/integration/pip_element.py
+++ b/tests/integration/pip_element.py
@@ -1,5 +1,5 @@
 import os
-import sys
+
 import pytest
 
 from buildstream import _yaml
diff --git a/tests/integration/pullbuildtrees.py b/tests/integration/pullbuildtrees.py
index b6c9a5535..efcf9cf87 100644
--- a/tests/integration/pullbuildtrees.py
+++ b/tests/integration/pullbuildtrees.py
@@ -8,9 +8,7 @@ from tests.testutils import create_artifact_share
 from tests.testutils.site import HAVE_SANDBOX
 
 from buildstream import utils
-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._cas import CASCache
 from buildstream._exceptions import ErrorDomain, LoadErrorReason
 
diff --git a/tests/integration/sandbox-bwrap.py b/tests/integration/sandbox-bwrap.py
index f64de3cf4..206a3c387 100644
--- a/tests/integration/sandbox-bwrap.py
+++ b/tests/integration/sandbox-bwrap.py
@@ -4,7 +4,6 @@ import pytest
 from buildstream._exceptions import ErrorDomain
 
 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/shell.py b/tests/integration/shell.py
index 7ab34b65f..1a10df59e 100644
--- a/tests/integration/shell.py
+++ b/tests/integration/shell.py
@@ -2,7 +2,6 @@ import os
 import pytest
 
 from buildstream import _yaml
-from buildstream._exceptions import ErrorDomain
 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 15a575863..6dc6b682c 100644
--- a/tests/integration/sockets.py
+++ b/tests/integration/sockets.py
@@ -1,9 +1,7 @@
 import os
 import pytest
 
-from buildstream import _yaml
 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 8ab11615a..9fc153e1a 100644
--- a/tests/integration/source-determinism.py
+++ b/tests/integration/source-determinism.py
@@ -1,7 +1,7 @@
 import os
 import pytest
 
-from buildstream import _yaml, utils
+from buildstream import _yaml
 from buildstream.plugintestutils import cli_integration as cli
 from tests.testutils import create_repo, ALL_REPO_KINDS
 from tests.testutils.site import HAVE_SANDBOX
diff --git a/tests/integration/stack.py b/tests/integration/stack.py
index 9b0f733b2..f8c837bbb 100644
--- a/tests/integration/stack.py
+++ b/tests/integration/stack.py
@@ -1,7 +1,6 @@
 import os
 import pytest
 
-from buildstream import _yaml
 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 8944c285d..1c2f3c2a7 100644
--- a/tests/integration/symlinks.py
+++ b/tests/integration/symlinks.py
@@ -1,11 +1,7 @@
 import os
-import shlex
 import pytest
 
-from buildstream import _yaml
-
 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 d0fea10a8..88a4a1f84 100644
--- a/tests/integration/workspace.py
+++ b/tests/integration/workspace.py
@@ -4,7 +4,6 @@ import pytest
 from buildstream import _yaml
 from buildstream.plugintestutils import cli_integration as cli
 from tests.testutils.site import HAVE_SANDBOX
-from buildstream.plugintestutils.integration import walk_dir
 
 
 pytestmark = pytest.mark.integration
diff --git a/tests/internals/loader.py b/tests/internals/loader.py
index a9727b680..8fe75770d 100644
--- a/tests/internals/loader.py
+++ b/tests/internals/loader.py
@@ -4,7 +4,8 @@ import pytest
 from buildstream._exceptions import LoadError, LoadErrorReason
 from buildstream._context import Context
 from buildstream._project import Project
-from buildstream._loader import Loader, MetaElement
+from buildstream._loader import MetaElement
+
 
 DATA_DIR = os.path.join(
     os.path.dirname(os.path.realpath(__file__)),
diff --git a/tests/internals/storage.py b/tests/internals/storage.py
index c09ff4380..36d9442c5 100644
--- a/tests/internals/storage.py
+++ b/tests/internals/storage.py
@@ -1,7 +1,6 @@
 import os
-import pytest
 
-from buildstream._exceptions import ErrorDomain
+import pytest
 
 from buildstream._cas import CASCache
 from buildstream.storage._casbaseddirectory import CasBasedDirectory
diff --git a/tests/internals/storage_vdir_import.py b/tests/internals/storage_vdir_import.py
index 5804e96f0..616f740e2 100644
--- a/tests/internals/storage_vdir_import.py
+++ b/tests/internals/storage_vdir_import.py
@@ -2,14 +2,11 @@ from hashlib import sha256
 import os
 import pytest
 import random
-import tempfile
 from buildstream.plugintestutils import cli
 
 from buildstream.storage._casbaseddirectory import CasBasedDirectory
 from buildstream.storage._filebaseddirectory import FileBasedDirectory
-from buildstream._artifactcache import ArtifactCache
 from buildstream._cas import CASCache
-from buildstream import utils
 
 
 # These are comparitive tests that check that FileBasedDirectory and
diff --git a/tests/plugins/deprecationwarnings/deprecationwarnings.py b/tests/plugins/deprecationwarnings/deprecationwarnings.py
index 32aa7891a..10b93cc7a 100644
--- a/tests/plugins/deprecationwarnings/deprecationwarnings.py
+++ b/tests/plugins/deprecationwarnings/deprecationwarnings.py
@@ -1,9 +1,6 @@
 import pytest
-import tempfile
 import os
 from buildstream.plugintestutils import cli
-from buildstream import _yaml
-import buildstream.plugins.elements.manual
 
 
 DATA_DIR = os.path.join(
diff --git a/tests/plugins/deprecationwarnings/project/plugins/elements/deprecated_plugin.py b/tests/plugins/deprecationwarnings/project/plugins/elements/deprecated_plugin.py
index a8e39562a..1badf59af 100644
--- a/tests/plugins/deprecationwarnings/project/plugins/elements/deprecated_plugin.py
+++ b/tests/plugins/deprecationwarnings/project/plugins/elements/deprecated_plugin.py
@@ -1,4 +1,4 @@
-from buildstream import BuildElement, SandboxFlags
+from buildstream import BuildElement
 
 
 class DeprecatedPlugin(BuildElement):
diff --git a/tests/sandboxes/remote-exec-config.py b/tests/sandboxes/remote-exec-config.py
index 9864f2591..31ba11678 100644
--- a/tests/sandboxes/remote-exec-config.py
+++ b/tests/sandboxes/remote-exec-config.py
@@ -1,6 +1,5 @@
 import pytest
 
-import itertools
 import os
 
 from buildstream import _yaml
diff --git a/tests/sources/bzr.py b/tests/sources/bzr.py
index bf7d1e844..3ff51bc2e 100644
--- a/tests/sources/bzr.py
+++ b/tests/sources/bzr.py
@@ -1,7 +1,6 @@
 import os
 import pytest
 
-from buildstream._pipeline import PipelineError
 from buildstream import _yaml
 
 from buildstream.plugintestutils import cli
diff --git a/tests/sources/deb.py b/tests/sources/deb.py
index 480bea6f4..766f6fcc9 100644
--- a/tests/sources/deb.py
+++ b/tests/sources/deb.py
@@ -1,13 +1,9 @@
 import os
 import pytest
-import tarfile
-import tempfile
-import subprocess
 import shutil
 
 from buildstream._exceptions import ErrorDomain
 from buildstream import _yaml
-from tempfile import TemporaryFile
 from buildstream.plugintestutils import cli
 from tests.testutils.site import HAVE_ARPY
 from . import list_dir_contents
diff --git a/tests/sources/git.py b/tests/sources/git.py
index 691ada8c2..40df30ac6 100644
--- a/tests/sources/git.py
+++ b/tests/sources/git.py
@@ -30,7 +30,6 @@ from buildstream import _yaml
 from buildstream.plugin import CoreWarnings
 from buildstream.plugintestutils import cli
 
-from tests.testutils.site import HAVE_GIT, HAVE_OLD_GIT
 from tests.testutils import create_repo
 from tests.testutils.site import HAVE_GIT, HAVE_OLD_GIT
 
diff --git a/tests/testutils/artifactshare.py b/tests/testutils/artifactshare.py
index c70e91413..41673ca1d 100644
--- a/tests/testutils/artifactshare.py
+++ b/tests/testutils/artifactshare.py
@@ -1,6 +1,4 @@
 import string
-import pytest
-import subprocess
 import os
 import shutil
 import signal
@@ -10,7 +8,6 @@ from contextlib import contextmanager
 from multiprocessing import Process, Queue
 import pytest_cov
 
-from buildstream import _yaml
 from buildstream._cas import CASCache
 from buildstream._cas.casserver import create_server
 from buildstream._exceptions import CASError
diff --git a/tests/testutils/junction.py b/tests/testutils/junction.py
index efc429ef6..01c76d14a 100644
--- a/tests/testutils/junction.py
+++ b/tests/testutils/junction.py
@@ -1,4 +1,3 @@
-import os
 from tests.testutils import create_repo
 from buildstream import _yaml
 
diff --git a/tests/testutils/repo/__init__.py b/tests/testutils/repo/__init__.py
index ff6844cf1..1881aa3c4 100644
--- a/tests/testutils/repo/__init__.py
+++ b/tests/testutils/repo/__init__.py
@@ -1,6 +1,4 @@
 from collections import OrderedDict
-import pytest
-from ..site import HAVE_OSTREE
 
 from .git import Git
 from .bzr import Bzr