diff options
Diffstat (limited to 'tests/frontend')
| -rw-r--r-- | tests/frontend/buildtrack.py | 3 | ||||
| -rw-r--r-- | tests/frontend/cross_junction_workspace.py | 3 | ||||
| -rw-r--r-- | tests/frontend/fetch.py | 4 | ||||
| -rw-r--r-- | tests/frontend/logging.py | 2 | ||||
| -rw-r--r-- | tests/frontend/mirror.py | 3 | ||||
| -rw-r--r-- | tests/frontend/order.py | 2 | ||||
| -rw-r--r-- | tests/frontend/track.py | 4 | ||||
| -rw-r--r-- | tests/frontend/workspace.py | 4 |
8 files changed, 11 insertions, 14 deletions
diff --git a/tests/frontend/buildtrack.py b/tests/frontend/buildtrack.py index 5a3781dc6..d4dc93aac 100644 --- a/tests/frontend/buildtrack.py +++ b/tests/frontend/buildtrack.py @@ -8,9 +8,8 @@ import itertools import pytest -from tests.testutils import create_repo - from buildstream import _yaml +from buildstream.plugintestutils import create_repo from buildstream.plugintestutils import cli # pylint: disable=unused-import from buildstream._exceptions import ErrorDomain diff --git a/tests/frontend/cross_junction_workspace.py b/tests/frontend/cross_junction_workspace.py index 88bda857d..a93d5c132 100644 --- a/tests/frontend/cross_junction_workspace.py +++ b/tests/frontend/cross_junction_workspace.py @@ -3,10 +3,9 @@ import os from buildstream.plugintestutils import cli # pylint: disable=unused-import +from buildstream.plugintestutils import create_repo from buildstream import _yaml -from tests.testutils import create_repo - def prepare_junction_project(cli, tmpdir): main_project = tmpdir.join("main") diff --git a/tests/frontend/fetch.py b/tests/frontend/fetch.py index 8282e2131..cea7ff129 100644 --- a/tests/frontend/fetch.py +++ b/tests/frontend/fetch.py @@ -4,8 +4,8 @@ import os import pytest -from tests.testutils import create_repo, generate_junction, yaml_file_get_provenance - +from tests.testutils import generate_junction, yaml_file_get_provenance +from buildstream.plugintestutils import create_repo from buildstream.plugintestutils import cli # pylint: disable=unused-import from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason diff --git a/tests/frontend/logging.py b/tests/frontend/logging.py index 4036a4693..49e3a70c6 100644 --- a/tests/frontend/logging.py +++ b/tests/frontend/logging.py @@ -6,7 +6,7 @@ import re import pytest -from tests.testutils import create_repo +from buildstream.plugintestutils import create_repo from buildstream import _yaml from buildstream._exceptions import ErrorDomain diff --git a/tests/frontend/mirror.py b/tests/frontend/mirror.py index b33d889c6..47f94289f 100644 --- a/tests/frontend/mirror.py +++ b/tests/frontend/mirror.py @@ -4,9 +4,8 @@ import os import pytest -from tests.testutils import create_repo - from buildstream import _yaml +from buildstream.plugintestutils import create_repo from buildstream.plugintestutils import cli # pylint: disable=unused-import diff --git a/tests/frontend/order.py b/tests/frontend/order.py index cd75aa6b7..5eb5b299d 100644 --- a/tests/frontend/order.py +++ b/tests/frontend/order.py @@ -4,7 +4,7 @@ import os import pytest -from tests.testutils import create_repo +from buildstream.plugintestutils import create_repo from buildstream.plugintestutils import cli # pylint: disable=unused-import from buildstream import _yaml diff --git a/tests/frontend/track.py b/tests/frontend/track.py index 46f5bcf67..17d0cd827 100644 --- a/tests/frontend/track.py +++ b/tests/frontend/track.py @@ -4,12 +4,12 @@ import stat import os import pytest -from tests.testutils import create_repo, generate_junction, yaml_file_get_provenance +from buildstream.plugintestutils import create_repo from buildstream.plugintestutils import cli # pylint: disable=unused-import from buildstream._exceptions import ErrorDomain, LoadErrorReason from buildstream import _yaml - +from tests.testutils import generate_junction, yaml_file_get_provenance from . import configure_project # Project directory diff --git a/tests/frontend/workspace.py b/tests/frontend/workspace.py index 78f3600d1..522bbffab 100644 --- a/tests/frontend/workspace.py +++ b/tests/frontend/workspace.py @@ -34,9 +34,9 @@ import subprocess import pytest -from tests.testutils import create_repo, ALL_REPO_KINDS, wait_for_cache_granularity -from tests.testutils import create_artifact_share, create_element_size +from tests.testutils import create_artifact_share, create_element_size, wait_for_cache_granularity +from buildstream.plugintestutils import create_repo, ALL_REPO_KINDS from buildstream.plugintestutils import cli # pylint: disable=unused-import from buildstream import _yaml from buildstream._exceptions import ErrorDomain, LoadErrorReason |