diff options
author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2018-04-29 15:46:13 +0900 |
---|---|---|
committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2018-05-08 03:59:38 +0900 |
commit | 11dffaef4b75806b166db1a46b520e6d147d7969 (patch) | |
tree | a9d370b13b8d22435c81607a6e0e9ea0085cd2a3 /tests/frontend | |
parent | 2390c81411aee2019cec891ea0be5247e779bc2e (diff) | |
download | buildstream-11dffaef4b75806b166db1a46b520e6d147d7969.tar.gz |
_stream.py: Add StreamError exception
Use Stream error for Stream errors.
Diffstat (limited to 'tests/frontend')
-rw-r--r-- | tests/frontend/buildcheckout.py | 4 | ||||
-rw-r--r-- | tests/frontend/logging.py | 2 | ||||
-rw-r--r-- | tests/frontend/overlaps.py | 4 | ||||
-rw-r--r-- | tests/frontend/push.py | 4 | ||||
-rw-r--r-- | tests/frontend/track.py | 4 |
5 files changed, 9 insertions, 9 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) |