summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/frontend/buildcheckout.py4
-rw-r--r--tests/frontend/logging.py2
-rw-r--r--tests/frontend/overlaps.py4
-rw-r--r--tests/frontend/push.py4
-rw-r--r--tests/frontend/track.py4
-rw-r--r--tests/integration/shell.py2
-rw-r--r--tests/sources/deb.py4
-rw-r--r--tests/sources/git.py2
-rw-r--r--tests/sources/local.py2
-rw-r--r--tests/sources/patch.py4
-rw-r--r--tests/sources/tar.py4
-rw-r--r--tests/sources/zip.py4
12 files changed, 20 insertions, 20 deletions
diff --git a/tests/frontend/buildcheckout.py b/tests/frontend/buildcheckout.py
index 45ef33bae..3eb98139f 100644
--- a/tests/frontend/buildcheckout.py
+++ b/tests/frontend/buildcheckout.py
@@ -88,7 +88,7 @@ def test_build_checkout_nonempty(datafiles, cli, hardlinks):
# Now check it out
result = cli.run(project=project, args=checkout_args)
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
@pytest.mark.datafiles(DATA_DIR)
@@ -192,7 +192,7 @@ def test_install_to_build(cli, tmpdir, datafiles):
# attempt to stage into /buildstream/build, which is not allowed.
result = cli.run(project=project, args=strict_args(['build', element], True))
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
result.assert_task_error(ErrorDomain.ELEMENT, None)
diff --git a/tests/frontend/logging.py b/tests/frontend/logging.py
index 46749f5d2..4c70895a5 100644
--- a/tests/frontend/logging.py
+++ b/tests/frontend/logging.py
@@ -100,7 +100,7 @@ def test_failed_build_listing(cli, tmpdir, datafiles):
_yaml.dump(element, os.path.join(project, element_path))
element_names.append(element_name)
result = cli.run(project=project, args=['--on-error=continue', 'build'] + element_names)
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
failure_heading_pos = re.search(r'^Failure Summary$', result.stderr, re.MULTILINE).start()
pipeline_heading_pos = re.search(r'^Pipeline Summary$', result.stderr, re.MULTILINE).start()
diff --git a/tests/frontend/overlaps.py b/tests/frontend/overlaps.py
index 794f73944..36e15acd7 100644
--- a/tests/frontend/overlaps.py
+++ b/tests/frontend/overlaps.py
@@ -38,7 +38,7 @@ def test_overlaps_error(cli, datafiles):
gen_project(project_dir, True)
result = cli.run(project=project_dir, silent=True, args=[
'build', 'collect.bst'])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
result.assert_task_error(ErrorDomain.ELEMENT, "overlap-error")
@@ -69,7 +69,7 @@ def test_overlaps_whitelist_on_overlapper(cli, datafiles):
gen_project(project_dir, True)
result = cli.run(project=project_dir, silent=True, args=[
'build', 'collect-partially-whitelisted.bst'])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
result.assert_task_error(ErrorDomain.ELEMENT, "overlap-error")
diff --git a/tests/frontend/push.py b/tests/frontend/push.py
index fa1a91045..71d154696 100644
--- a/tests/frontend/push.py
+++ b/tests/frontend/push.py
@@ -58,7 +58,7 @@ def test_push(cli, tmpdir, datafiles):
# Try pushing with no remotes configured. This should fail.
result = cli.run(project=project, args=['push', 'target.bst'])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
# Configure bst to pull but not push from a cache and run `bst push`.
# This should also fail.
@@ -66,7 +66,7 @@ def test_push(cli, tmpdir, datafiles):
'artifacts': {'url': share1.repo, 'push': False},
})
result = cli.run(project=project, args=['push', 'target.bst'])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
# Configure bst to push to one of the caches and run `bst push`. This works.
cli.configure({
diff --git a/tests/frontend/track.py b/tests/frontend/track.py
index f8818ffb5..2defc2349 100644
--- a/tests/frontend/track.py
+++ b/tests/frontend/track.py
@@ -350,7 +350,7 @@ def test_track_consistency_error(cli, tmpdir, datafiles):
# Track the element causing a consistency error
result = cli.run(project=project, args=['track', 'error.bst'])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
result.assert_task_error(ErrorDomain.SOURCE, 'the-consistency-error')
@@ -362,7 +362,7 @@ def test_track_consistency_bug(cli, tmpdir, datafiles):
result = cli.run(project=project, args=['track', 'bug.bst'])
# We expect BuildStream to fail gracefully, with no recorded exception.
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
@pytest.mark.datafiles(DATA_DIR)
diff --git a/tests/integration/shell.py b/tests/integration/shell.py
index 844f51d62..18953aa2d 100644
--- a/tests/integration/shell.py
+++ b/tests/integration/shell.py
@@ -317,7 +317,7 @@ def test_sysroot_workspace_visible(cli, tmpdir, datafiles):
# Ensure the dependencies of our build failing element are built
result = cli.run(project=project, args=['build', element_name])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
# Discover the sysroot of the failed build directory, after one
# failed build, there should be only one directory there.
diff --git a/tests/sources/deb.py b/tests/sources/deb.py
index a4dbd7866..b905f0dcb 100644
--- a/tests/sources/deb.py
+++ b/tests/sources/deb.py
@@ -65,7 +65,7 @@ def test_fetch_bad_url(cli, tmpdir, datafiles):
result = cli.run(project=project, args=[
'fetch', 'target.bst'
])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
result.assert_task_error(ErrorDomain.SOURCE, None)
@@ -82,7 +82,7 @@ def test_fetch_bad_ref(cli, tmpdir, datafiles):
result = cli.run(project=project, args=[
'fetch', 'target.bst'
])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
result.assert_task_error(ErrorDomain.SOURCE, None)
diff --git a/tests/sources/git.py b/tests/sources/git.py
index bc69d0579..06888c311 100644
--- a/tests/sources/git.py
+++ b/tests/sources/git.py
@@ -35,7 +35,7 @@ def test_fetch_bad_ref(cli, tmpdir, datafiles):
result = cli.run(project=project, args=[
'fetch', 'target.bst'
])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
result.assert_task_error(ErrorDomain.SOURCE, None)
diff --git a/tests/sources/local.py b/tests/sources/local.py
index bfddf6881..9dfb5f972 100644
--- a/tests/sources/local.py
+++ b/tests/sources/local.py
@@ -88,5 +88,5 @@ def test_stage_file_exists(cli, tmpdir, datafiles):
# Build, checkout
result = cli.run(project=project, args=['build', 'target.bst'])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
result.assert_task_error(ErrorDomain.SOURCE, 'ensure-stage-dir-fail')
diff --git a/tests/sources/patch.py b/tests/sources/patch.py
index 2f23fd5dd..697a0ccfb 100644
--- a/tests/sources/patch.py
+++ b/tests/sources/patch.py
@@ -61,7 +61,7 @@ def test_stage_file_nonexistent_dir(cli, tmpdir, datafiles):
# Fails at build time because it tries to patch into a non-existing directory
result = cli.run(project=project, args=['build', 'failure-nonexistent-dir.bst'])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
result.assert_task_error(ErrorDomain.SOURCE, "patch-no-files")
@@ -72,7 +72,7 @@ def test_stage_file_empty_dir(cli, tmpdir, datafiles):
# Fails at build time because it tries to patch with nothing else staged
result = cli.run(project=project, args=['build', 'failure-empty-dir.bst'])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
result.assert_task_error(ErrorDomain.SOURCE, "patch-no-files")
diff --git a/tests/sources/tar.py b/tests/sources/tar.py
index c0b29ee3f..95bbd3f66 100644
--- a/tests/sources/tar.py
+++ b/tests/sources/tar.py
@@ -65,7 +65,7 @@ def test_fetch_bad_url(cli, tmpdir, datafiles):
result = cli.run(project=project, args=[
'fetch', 'target.bst'
])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
result.assert_task_error(ErrorDomain.SOURCE, None)
@@ -83,7 +83,7 @@ def test_fetch_bad_ref(cli, tmpdir, datafiles):
result = cli.run(project=project, args=[
'fetch', 'target.bst'
])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
result.assert_task_error(ErrorDomain.SOURCE, None)
diff --git a/tests/sources/zip.py b/tests/sources/zip.py
index b028163f9..5281fcea2 100644
--- a/tests/sources/zip.py
+++ b/tests/sources/zip.py
@@ -52,7 +52,7 @@ def test_fetch_bad_url(cli, tmpdir, datafiles):
result = cli.run(project=project, args=[
'fetch', 'target.bst'
])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
result.assert_task_error(ErrorDomain.SOURCE, None)
@@ -70,7 +70,7 @@ def test_fetch_bad_ref(cli, tmpdir, datafiles):
result = cli.run(project=project, args=[
'fetch', 'target.bst'
])
- result.assert_main_error(ErrorDomain.PIPELINE, None)
+ result.assert_main_error(ErrorDomain.STREAM, None)
result.assert_task_error(ErrorDomain.SOURCE, None)
View Lorry Controller Status