diff options
Diffstat (limited to 'tests/integration')
-rw-r--r-- | tests/integration/artifact.py | 1 | ||||
-rw-r--r-- | tests/integration/build-uid.py | 3 | ||||
-rw-r--r-- | tests/integration/compose-symlinks.py | 5 | ||||
-rw-r--r-- | tests/integration/compose.py | 2 | ||||
-rw-r--r-- | tests/integration/pip_element.py | 2 | ||||
-rw-r--r-- | tests/integration/pullbuildtrees.py | 2 | ||||
-rw-r--r-- | tests/integration/sandbox-bwrap.py | 1 | ||||
-rw-r--r-- | tests/integration/shell.py | 1 | ||||
-rw-r--r-- | tests/integration/sockets.py | 2 | ||||
-rw-r--r-- | tests/integration/source-determinism.py | 2 | ||||
-rw-r--r-- | tests/integration/stack.py | 1 | ||||
-rw-r--r-- | tests/integration/symlinks.py | 4 | ||||
-rw-r--r-- | tests/integration/workspace.py | 1 |
13 files changed, 2 insertions, 25 deletions
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 |