summaryrefslogtreecommitdiff
path: root/tests/format
diff options
context:
space:
mode:
authorThomas Coldrick <thomas.coldrick@codethink.co.uk>2020-01-17 15:22:06 +0000
committerThomas Coldrick <thomas.coldrick@codethink.co.uk>2020-01-23 16:45:35 +0000
commit8aa7e8b6c2ca418aafddf4ce308a9d0ff56cf467 (patch)
tree01fef02fe2ca9634b1ede36d5b96fab66a6532f5 /tests/format
parentbf5f20704831f58d7ced04e960ca8f7b97c6736c (diff)
downloadbuildstream-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/format')
-rw-r--r--tests/format/assertion.py2
-rw-r--r--tests/format/dependencies.py2
-rw-r--r--tests/format/include.py2
-rw-r--r--tests/format/invalid_keys.py2
-rw-r--r--tests/format/junctions.py2
-rw-r--r--tests/format/listdirectiveerrors.py2
-rw-r--r--tests/format/optionarch.py2
-rw-r--r--tests/format/optionbool.py2
-rw-r--r--tests/format/optioneltmask.py2
-rw-r--r--tests/format/optionenum.py2
-rw-r--r--tests/format/optionflags.py2
-rw-r--r--tests/format/optionos.py2
-rw-r--r--tests/format/options.py2
-rw-r--r--tests/format/project.py2
-rw-r--r--tests/format/userconfig.py2
-rw-r--r--tests/format/variables.py2
16 files changed, 16 insertions, 16 deletions
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