diff options
| author | Thomas Coldrick <thomas.coldrick@codethink.co.uk> | 2020-01-17 15:22:06 +0000 |
|---|---|---|
| committer | Thomas Coldrick <thomas.coldrick@codethink.co.uk> | 2020-01-23 16:45:35 +0000 |
| commit | 8aa7e8b6c2ca418aafddf4ce308a9d0ff56cf467 (patch) | |
| tree | 01fef02fe2ca9634b1ede36d5b96fab66a6532f5 /tests | |
| parent | bf5f20704831f58d7ced04e960ca8f7b97c6736c (diff) | |
| download | buildstream-8aa7e8b6c2ca418aafddf4ce308a9d0ff56cf467.tar.gz | |
exceptions: Expose ErrorDomain, ErrorLoadReason
Plugin tests are already accessing this API, but using imports from
private modules. For motivation for this to be exposed publicly, note
that ErrorDomain is an argument for most things in runcli.py, and
LoadErrorReason may be another.
Diffstat (limited to 'tests')
62 files changed, 66 insertions, 62 deletions
diff --git a/tests/artifactcache/config.py b/tests/artifactcache/config.py index 64e6c6a30..a42d1e487 100644 --- a/tests/artifactcache/config.py +++ b/tests/artifactcache/config.py @@ -11,7 +11,7 @@ from buildstream._artifactcache import ArtifactCache from buildstream._project import Project from buildstream.utils import _deduplicate from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing.runcli import cli # pylint: disable=unused-import diff --git a/tests/artifactcache/expiry.py b/tests/artifactcache/expiry.py index 83577f0c6..1474cecf6 100644 --- a/tests/artifactcache/expiry.py +++ b/tests/artifactcache/expiry.py @@ -26,7 +26,7 @@ import time import pytest from buildstream._cas import CASCache -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils import create_element_size, wait_for_cache_granularity diff --git a/tests/elements/filter.py b/tests/elements/filter.py index 3b38094dc..2f16270d8 100644 --- a/tests/elements/filter.py +++ b/tests/elements/filter.py @@ -8,7 +8,7 @@ import pytest from buildstream.testing import create_repo from buildstream.testing import cli # pylint: disable=unused-import -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream import _yaml DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "filter",) diff --git a/tests/format/assertion.py b/tests/format/assertion.py index 67436250a..3ca50726c 100644 --- a/tests/format/assertion.py +++ b/tests/format/assertion.py @@ -3,7 +3,7 @@ import os import pytest -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory diff --git a/tests/format/dependencies.py b/tests/format/dependencies.py index e54b9b2d5..b1a684081 100644 --- a/tests/format/dependencies.py +++ b/tests/format/dependencies.py @@ -4,7 +4,7 @@ import os import pytest -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason 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 5efbc62a9..3e7e0abf0 100644 --- a/tests/format/include.py +++ b/tests/format/include.py @@ -5,7 +5,7 @@ import os import textwrap import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason 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/invalid_keys.py b/tests/format/invalid_keys.py index ce1e2e487..b2bab194e 100644 --- a/tests/format/invalid_keys.py +++ b/tests/format/invalid_keys.py @@ -3,7 +3,7 @@ import os import pytest -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory diff --git a/tests/format/junctions.py b/tests/format/junctions.py index 43cd3f7ba..581e7442f 100644 --- a/tests/format/junctions.py +++ b/tests/format/junctions.py @@ -7,7 +7,7 @@ import shutil import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing import cli # pylint: disable=unused-import from buildstream.testing import create_repo from buildstream.testing._utils.site import HAVE_GIT diff --git a/tests/format/listdirectiveerrors.py b/tests/format/listdirectiveerrors.py index 79102cb02..77d9b3f55 100644 --- a/tests/format/listdirectiveerrors.py +++ b/tests/format/listdirectiveerrors.py @@ -3,7 +3,7 @@ import os import pytest -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory diff --git a/tests/format/optionarch.py b/tests/format/optionarch.py index 75cae9abe..4f7084b11 100644 --- a/tests/format/optionarch.py +++ b/tests/format/optionarch.py @@ -6,7 +6,7 @@ import os import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason 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 3b05aafa1..6f5624926 100644 --- a/tests/format/optionbool.py +++ b/tests/format/optionbool.py @@ -4,7 +4,7 @@ import os import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory diff --git a/tests/format/optioneltmask.py b/tests/format/optioneltmask.py index 399b37b97..c5b32d127 100644 --- a/tests/format/optioneltmask.py +++ b/tests/format/optioneltmask.py @@ -4,7 +4,7 @@ import os import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory diff --git a/tests/format/optionenum.py b/tests/format/optionenum.py index ba79bea79..b525347f8 100644 --- a/tests/format/optionenum.py +++ b/tests/format/optionenum.py @@ -4,7 +4,7 @@ import os import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory diff --git a/tests/format/optionflags.py b/tests/format/optionflags.py index 53e674919..a3c310f05 100644 --- a/tests/format/optionflags.py +++ b/tests/format/optionflags.py @@ -4,7 +4,7 @@ import os import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory diff --git a/tests/format/optionos.py b/tests/format/optionos.py index 16177c4fb..46ec22de5 100644 --- a/tests/format/optionos.py +++ b/tests/format/optionos.py @@ -6,7 +6,7 @@ import os import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing.runcli import cli # pylint: disable=unused-import from tests.testutils import override_platform_uname diff --git a/tests/format/options.py b/tests/format/options.py index aa0854e96..4af3495b4 100644 --- a/tests/format/options.py +++ b/tests/format/options.py @@ -4,7 +4,7 @@ import os import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory diff --git a/tests/format/project.py b/tests/format/project.py index e6bc6a5cd..3d0931b86 100644 --- a/tests/format/project.py +++ b/tests/format/project.py @@ -4,7 +4,7 @@ import os import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils import filetypegenerator diff --git a/tests/format/userconfig.py b/tests/format/userconfig.py index 9b514cc3d..134327bad 100644 --- a/tests/format/userconfig.py +++ b/tests/format/userconfig.py @@ -5,7 +5,7 @@ import os import pytest -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing.runcli import cli # pylint: disable=unused-import # Project directory diff --git a/tests/format/variables.py b/tests/format/variables.py index 1d8b5aff9..11a34ee07 100644 --- a/tests/format/variables.py +++ b/tests/format/variables.py @@ -7,7 +7,7 @@ import sys import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing.runcli import cli # pylint: disable=unused-import diff --git a/tests/frontend/artifact_delete.py b/tests/frontend/artifact_delete.py index a93d99ef6..2651f567e 100644 --- a/tests/frontend/artifact_delete.py +++ b/tests/frontend/artifact_delete.py @@ -22,7 +22,7 @@ import os import pytest from buildstream.element import _get_normal_name -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils import create_artifact_share diff --git a/tests/frontend/artifact_show.py b/tests/frontend/artifact_show.py index 6f824c0e4..de9b78c45 100644 --- a/tests/frontend/artifact_show.py +++ b/tests/frontend/artifact_show.py @@ -21,7 +21,7 @@ import os import pytest -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils import create_artifact_share diff --git a/tests/frontend/buildcheckout.py b/tests/frontend/buildcheckout.py index d6a216daf..512c6c151 100644 --- a/tests/frontend/buildcheckout.py +++ b/tests/frontend/buildcheckout.py @@ -12,7 +12,7 @@ from buildstream.testing import cli # pylint: disable=unused-import from buildstream.testing import create_repo from buildstream.testing._utils.site import IS_WINDOWS, CASD_SEPARATE_USER from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream import utils from tests.testutils import generate_junction, create_artifact_share diff --git a/tests/frontend/configurable_warnings.py b/tests/frontend/configurable_warnings.py index 488dab233..be0706360 100644 --- a/tests/frontend/configurable_warnings.py +++ b/tests/frontend/configurable_warnings.py @@ -6,7 +6,7 @@ import os import pytest from buildstream.plugin import CoreWarnings -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream import _yaml from buildstream.testing.runcli import cli # pylint: disable=unused-import diff --git a/tests/frontend/fetch.py b/tests/frontend/fetch.py index 8bd54ccc1..d6b28c589 100644 --- a/tests/frontend/fetch.py +++ b/tests/frontend/fetch.py @@ -6,7 +6,7 @@ import pytest from buildstream.testing import cli # pylint: disable=unused-import from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from tests.testutils import generate_junction diff --git a/tests/frontend/init.py b/tests/frontend/init.py index 3b9a95c34..78aa3eb19 100644 --- a/tests/frontend/init.py +++ b/tests/frontend/init.py @@ -7,7 +7,7 @@ from buildstream.testing import cli # pylint: disable=unused-import from buildstream import _yaml from buildstream._frontend.app import App -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream._versions import BST_FORMAT_VERSION diff --git a/tests/frontend/logging.py b/tests/frontend/logging.py index 27ff88352..7db37fa4c 100644 --- a/tests/frontend/logging.py +++ b/tests/frontend/logging.py @@ -9,7 +9,7 @@ import pytest from buildstream.testing import create_repo from buildstream import _yaml -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream.testing import cli # pylint: disable=unused-import # Project directory diff --git a/tests/frontend/overlaps.py b/tests/frontend/overlaps.py index e1c5a7c94..d734a3781 100644 --- a/tests/frontend/overlaps.py +++ b/tests/frontend/overlaps.py @@ -4,7 +4,7 @@ import os import pytest from buildstream.testing.runcli import cli # pylint: disable=unused-import -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream import _yaml from buildstream.plugin import CoreWarnings from tests.testutils import generate_junction diff --git a/tests/frontend/progress.py b/tests/frontend/progress.py index 45cba0b50..5d446bb10 100644 --- a/tests/frontend/progress.py +++ b/tests/frontend/progress.py @@ -6,7 +6,7 @@ import pytest from buildstream.testing import cli # pylint: disable=unused-import from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from tests.testutils import generate_junction diff --git a/tests/frontend/push.py b/tests/frontend/push.py index 583b57399..e9dfa2c6a 100644 --- a/tests/frontend/push.py +++ b/tests/frontend/push.py @@ -26,7 +26,7 @@ import os import pytest -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils import ( create_artifact_share, diff --git a/tests/frontend/show.py b/tests/frontend/show.py index 94b94a058..17931ffe3 100644 --- a/tests/frontend/show.py +++ b/tests/frontend/show.py @@ -8,7 +8,7 @@ import itertools import pytest from buildstream.testing import cli # pylint: disable=unused-import from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from tests.testutils import generate_junction diff --git a/tests/frontend/track.py b/tests/frontend/track.py index 477c81556..07a89d428 100644 --- a/tests/frontend/track.py +++ b/tests/frontend/track.py @@ -7,7 +7,7 @@ import pytest from buildstream.testing import create_repo from buildstream.testing import cli # pylint: disable=unused-import -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream import _yaml from tests.testutils import generate_junction from . import configure_project diff --git a/tests/frontend/workspace.py b/tests/frontend/workspace.py index eabaca68c..e05b6bd1f 100644 --- a/tests/frontend/workspace.py +++ b/tests/frontend/workspace.py @@ -37,7 +37,7 @@ import pytest from buildstream.testing import create_repo, ALL_REPO_KINDS from buildstream.testing import cli # pylint: disable=unused-import from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream._workspaces import BST_WORKSPACE_FORMAT_VERSION from tests.testutils import create_artifact_share, create_element_size, wait_for_cache_granularity diff --git a/tests/integration/cachedfail.py b/tests/integration/cachedfail.py index 9d68635e8..da764bbd2 100644 --- a/tests/integration/cachedfail.py +++ b/tests/integration/cachedfail.py @@ -21,7 +21,7 @@ import os import pytest from buildstream import utils, _yaml -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream.testing import cli_integration as cli # pylint: disable=unused-import from buildstream.testing._utils.site import HAVE_SANDBOX diff --git a/tests/integration/messages.py b/tests/integration/messages.py index f35b778d6..1a324a61f 100644 --- a/tests/integration/messages.py +++ b/tests/integration/messages.py @@ -24,7 +24,7 @@ import os import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream.testing import cli_integration as cli # pylint: disable=unused-import from buildstream.testing._utils.site import HAVE_SANDBOX diff --git a/tests/integration/pullbuildtrees.py b/tests/integration/pullbuildtrees.py index b43a07121..6d9eefb26 100644 --- a/tests/integration/pullbuildtrees.py +++ b/tests/integration/pullbuildtrees.py @@ -8,7 +8,7 @@ import pytest from buildstream.testing import cli, cli_integration as cli2 # pylint: disable=unused-import from buildstream.testing._utils.site import HAVE_SANDBOX -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from tests.testutils import create_artifact_share diff --git a/tests/integration/sandbox-bwrap.py b/tests/integration/sandbox-bwrap.py index a6312914b..3bf734edb 100644 --- a/tests/integration/sandbox-bwrap.py +++ b/tests/integration/sandbox-bwrap.py @@ -4,7 +4,7 @@ import os import pytest -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream.testing import cli_integration as cli # pylint: disable=unused-import from buildstream.testing._utils.site import HAVE_SANDBOX, HAVE_BWRAP_JSON_STATUS diff --git a/tests/integration/shell.py b/tests/integration/shell.py index 040ae53a5..5e35d550c 100644 --- a/tests/integration/shell.py +++ b/tests/integration/shell.py @@ -7,7 +7,7 @@ import pytest from buildstream import _yaml from buildstream.testing import cli_integration as cli # pylint: disable=unused-import from buildstream.testing._utils.site import HAVE_SANDBOX, BUILDBOX_RUN -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream import utils from tests.testutils import create_artifact_share diff --git a/tests/integration/shellbuildtrees.py b/tests/integration/shellbuildtrees.py index a3e7da1c2..0d80c1640 100644 --- a/tests/integration/shellbuildtrees.py +++ b/tests/integration/shellbuildtrees.py @@ -7,7 +7,7 @@ import shutil import pytest from buildstream.testing import cli, cli_integration # pylint: disable=unused-import -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream.testing._utils.site import HAVE_SANDBOX from tests.testutils import create_artifact_share diff --git a/tests/integration/workspace.py b/tests/integration/workspace.py index 776a1a1a6..7e84b690b 100644 --- a/tests/integration/workspace.py +++ b/tests/integration/workspace.py @@ -7,7 +7,7 @@ import pytest from buildstream import _yaml from buildstream.testing import cli_integration as cli # pylint: disable=unused-import from buildstream.testing._utils.site import HAVE_SANDBOX -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain pytestmark = pytest.mark.integration diff --git a/tests/internals/context.py b/tests/internals/context.py index c2ee1efb5..a8b9f6dd3 100644 --- a/tests/internals/context.py +++ b/tests/internals/context.py @@ -5,7 +5,8 @@ import os import pytest from buildstream._context import Context -from buildstream._exceptions import LoadError, LoadErrorReason +from buildstream._exceptions import LoadError +from buildstream.exceptions import LoadErrorReason DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "context",) diff --git a/tests/internals/loader.py b/tests/internals/loader.py index 781d144ae..6fdd9fc3a 100644 --- a/tests/internals/loader.py +++ b/tests/internals/loader.py @@ -2,7 +2,8 @@ from contextlib import contextmanager import os import pytest -from buildstream._exceptions import LoadError, LoadErrorReason +from buildstream.exceptions import LoadErrorReason +from buildstream._exceptions import LoadError from buildstream._project import Project from buildstream._loader import MetaElement from buildstream._loader.loader import _NO_PROGRESS diff --git a/tests/internals/pluginloading.py b/tests/internals/pluginloading.py index 83944bbd9..0685b09da 100644 --- a/tests/internals/pluginloading.py +++ b/tests/internals/pluginloading.py @@ -3,7 +3,8 @@ import os import pytest from buildstream._project import Project -from buildstream._exceptions import LoadError, LoadErrorReason +from buildstream._exceptions import LoadError +from buildstream.exceptions import LoadErrorReason from buildstream._pipeline import Pipeline from tests.testutils import dummy_context diff --git a/tests/internals/yaml.py b/tests/internals/yaml.py index 7b711575c..a4f8d08cc 100644 --- a/tests/internals/yaml.py +++ b/tests/internals/yaml.py @@ -4,7 +4,8 @@ from io import StringIO import pytest from buildstream import _yaml, Node, ProvenanceInformation, SequenceNode -from buildstream._exceptions import LoadError, LoadErrorReason +from buildstream.exceptions import LoadErrorReason +from buildstream._exceptions import LoadError DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "yaml",) diff --git a/tests/remoteexecution/buildfail.py b/tests/remoteexecution/buildfail.py index 22d9c825f..37f4dcafa 100644 --- a/tests/remoteexecution/buildfail.py +++ b/tests/remoteexecution/buildfail.py @@ -21,7 +21,7 @@ import os import pytest -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream import _yaml from buildstream.testing import cli_remote_execution as cli # pylint: disable=unused-import diff --git a/tests/remoteexecution/partial.py b/tests/remoteexecution/partial.py index a452d6613..ec5fabedb 100644 --- a/tests/remoteexecution/partial.py +++ b/tests/remoteexecution/partial.py @@ -4,7 +4,7 @@ import os import pytest -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream.testing import cli_remote_execution as cli # pylint: disable=unused-import from buildstream.testing.integration import assert_contains diff --git a/tests/sandboxes/fallback.py b/tests/sandboxes/fallback.py index 948e3a6de..0fd8ed4aa 100644 --- a/tests/sandboxes/fallback.py +++ b/tests/sandboxes/fallback.py @@ -20,7 +20,7 @@ import os import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream.testing import cli # pylint: disable=unused-import pytestmark = pytest.mark.integration diff --git a/tests/sandboxes/missing-command.py b/tests/sandboxes/missing-command.py index 87e668966..ec6ba184b 100644 --- a/tests/sandboxes/missing-command.py +++ b/tests/sandboxes/missing-command.py @@ -4,7 +4,7 @@ import os import pytest -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream.testing import cli # pylint: disable=unused-import diff --git a/tests/sandboxes/missing_dependencies.py b/tests/sandboxes/missing_dependencies.py index 722cfc647..2e96a1b1f 100644 --- a/tests/sandboxes/missing_dependencies.py +++ b/tests/sandboxes/missing_dependencies.py @@ -6,7 +6,7 @@ import os import pytest from buildstream import utils, _yaml -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream.testing._utils.site import IS_LINUX from buildstream.testing import cli # pylint: disable=unused-import diff --git a/tests/sandboxes/remote-exec-config.py b/tests/sandboxes/remote-exec-config.py index 7066ddeab..a6297834b 100644 --- a/tests/sandboxes/remote-exec-config.py +++ b/tests/sandboxes/remote-exec-config.py @@ -6,7 +6,7 @@ import os import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing.runcli import cli # pylint: disable=unused-import DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "remote-exec-config") diff --git a/tests/sandboxes/selection.py b/tests/sandboxes/selection.py index a338fe0bb..daee6dcdd 100644 --- a/tests/sandboxes/selection.py +++ b/tests/sandboxes/selection.py @@ -20,7 +20,7 @@ import os import pytest from buildstream import utils, _yaml -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream.testing import cli # pylint: disable=unused-import pytestmark = pytest.mark.integration diff --git a/tests/sourcecache/config.py b/tests/sourcecache/config.py index 9233e9f44..0c11a2726 100644 --- a/tests/sourcecache/config.py +++ b/tests/sourcecache/config.py @@ -25,7 +25,7 @@ import os import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing.runcli import cli # pylint: disable=unused-import diff --git a/tests/sourcecache/fetch.py b/tests/sourcecache/fetch.py index e21f84c89..889de62f0 100644 --- a/tests/sourcecache/fetch.py +++ b/tests/sourcecache/fetch.py @@ -24,7 +24,7 @@ import os import shutil import pytest -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream._project import Project from buildstream import _yaml from buildstream.testing import cli # pylint: disable=unused-import diff --git a/tests/sourcecache/push.py b/tests/sourcecache/push.py index 210bbfcff..9f8663a4a 100644 --- a/tests/sourcecache/push.py +++ b/tests/sourcecache/push.py @@ -25,7 +25,7 @@ from contextlib import contextmanager, ExitStack import pytest -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream._project import Project from buildstream import _yaml from buildstream.testing import cli # pylint: disable=unused-import diff --git a/tests/sourcecache/source-checkout.py b/tests/sourcecache/source-checkout.py index f1e0706a7..8abceadbd 100644 --- a/tests/sourcecache/source-checkout.py +++ b/tests/sourcecache/source-checkout.py @@ -26,7 +26,7 @@ import shutil import pytest -from buildstream._exceptions import ErrorDomain +from buildstream.exceptions import ErrorDomain from buildstream.testing.runcli import cli # pylint: disable=unused-import from tests.testutils.element_generators import create_element_size diff --git a/tests/sources/git.py b/tests/sources/git.py index 25976ffca..1176c8ffd 100644 --- a/tests/sources/git.py +++ b/tests/sources/git.py @@ -29,8 +29,8 @@ import shutil import pytest -from buildstream._exceptions import ErrorDomain from buildstream import _yaml, Node +from buildstream.exceptions import ErrorDomain from buildstream.plugin import CoreWarnings from buildstream.testing import cli # pylint: disable=unused-import from buildstream.testing import create_repo diff --git a/tests/sources/keytest.py b/tests/sources/keytest.py index 46d0d07fe..70e01f60f 100644 --- a/tests/sources/keytest.py +++ b/tests/sources/keytest.py @@ -24,7 +24,7 @@ import os import pytest -from buildstream._exceptions import ErrorDomain +from buildstream.testing import ErrorDomain from buildstream.testing import cli # pylint: disable=unused-import DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "project_key_test") diff --git a/tests/sources/local.py b/tests/sources/local.py index 92313ca7f..2b0155107 100644 --- a/tests/sources/local.py +++ b/tests/sources/local.py @@ -5,7 +5,7 @@ import os import pytest from buildstream import _yaml -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing import cli # pylint: disable=unused-import from buildstream.testing._utils.site import HAVE_SANDBOX from tests.testutils import filetypegenerator diff --git a/tests/sources/patch.py b/tests/sources/patch.py index 2b80a7055..5392a64cb 100644 --- a/tests/sources/patch.py +++ b/tests/sources/patch.py @@ -4,7 +4,7 @@ import os import pytest -from buildstream._exceptions import ErrorDomain, LoadErrorReason +from buildstream.exceptions import ErrorDomain, LoadErrorReason from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils import filetypegenerator diff --git a/tests/sources/pip.py b/tests/sources/pip.py index aafdfaf1c..7020f19c2 100644 --- a/tests/sources/pip.py +++ b/tests/sources/pip.py @@ -4,8 +4,8 @@ import os import pytest -from buildstream._exceptions import ErrorDomain from buildstream import _yaml +from buildstream.exceptions import ErrorDomain from buildstream.plugins.sources.pip import _match_package_name from buildstream.testing import cli # pylint: disable=unused-import diff --git a/tests/sources/remote.py b/tests/sources/remote.py index 76e469c60..00a7687b3 100644 --- a/tests/sources/remote.py +++ b/tests/sources/remote.py @@ -5,7 +5,7 @@ import os import stat import pytest -from buildstream._exceptions import ErrorDomain +from buildstream.testing import ErrorDomain from buildstream import _yaml from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils.file_server import create_file_server diff --git a/tests/sources/tar.py b/tests/sources/tar.py index c3621c152..d35cc2964 100644 --- a/tests/sources/tar.py +++ b/tests/sources/tar.py @@ -11,8 +11,8 @@ import urllib.parse import pytest from buildstream import utils -from buildstream._exceptions import ErrorDomain from buildstream import _yaml +from buildstream.exceptions import ErrorDomain from buildstream.testing import cli # pylint: disable=unused-import from buildstream.testing._utils.site import HAVE_LZIP from tests.testutils.file_server import create_file_server diff --git a/tests/sources/zip.py b/tests/sources/zip.py index dcb1e2637..7c47058b5 100644 --- a/tests/sources/zip.py +++ b/tests/sources/zip.py @@ -6,8 +6,8 @@ import zipfile import pytest -from buildstream._exceptions import ErrorDomain from buildstream import _yaml +from buildstream.exceptions import ErrorDomain from buildstream.testing import cli # pylint: disable=unused-import from tests.testutils.file_server import create_file_server from . import list_dir_contents |