diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/frontend/fetch.py | 2 | ||||
| -rw-r--r-- | tests/frontend/push.py | 8 | ||||
| -rw-r--r-- | tests/integration/interactive_build.py | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/tests/frontend/fetch.py b/tests/frontend/fetch.py index b2c9d64c2..3dfeabe5d 100644 --- a/tests/frontend/fetch.py +++ b/tests/frontend/fetch.py @@ -65,7 +65,7 @@ def test_fetch_consistency_error(cli, datafiles): # When the error occurs outside of the scheduler at load time, # then the SourceError is reported directly as the main error. result = cli.run(project=project, args=["source", "fetch", "error.bst"]) - result.assert_main_error(ErrorDomain.SOURCE, "the-consistency-error") + result.assert_main_error(ErrorDomain.SOURCE, "the-consistency-error", debug=True) @pytest.mark.datafiles(os.path.join(TOP_DIR, "consistencyerror")) diff --git a/tests/frontend/push.py b/tests/frontend/push.py index ffcc166f9..0054636ec 100644 --- a/tests/frontend/push.py +++ b/tests/frontend/push.py @@ -380,8 +380,8 @@ def test_push_after_pull(cli, tmpdir, datafiles): # result = cli.run(project=project, args=["build", "target.bst"]) result.assert_success() - assert result.get_pulled_elements() == ["target.bst"] - assert result.get_pushed_elements() == [] + assert "target.bst" in result.get_pulled_elements() + assert "target.bst" not in result.get_pushed_elements() # Delete the artifact locally again. cli.remove_artifact_from_cache(project, "target.bst") @@ -391,8 +391,8 @@ def test_push_after_pull(cli, tmpdir, datafiles): cli.configure({"artifacts": [{"url": share1.repo, "push": True}, {"url": share2.repo, "push": True},]}) result = cli.run(project=project, args=["build", "target.bst"]) result.assert_success() - assert result.get_pulled_elements() == ["target.bst"] - assert result.get_pushed_elements() == ["target.bst"] + assert "target.bst" in result.get_pulled_elements() + assert "target.bst" in result.get_pushed_elements() # Ensure that when an artifact's size exceeds available disk space diff --git a/tests/integration/interactive_build.py b/tests/integration/interactive_build.py index 285cb86f8..b19d16e0f 100644 --- a/tests/integration/interactive_build.py +++ b/tests/integration/interactive_build.py @@ -4,6 +4,7 @@ import os import pexpect import pytest +import sys from buildstream.testing import runcli from buildstream.testing._utils.site import HAVE_SANDBOX @@ -29,7 +30,9 @@ def build_session(datafiles, element_name): "bst", ["--directory", project, "--config", config_file, "--no-colors", "build", element_name,], timeout=PEXPECT_TIMEOUT_SHORT, + encoding='utf-8' ) + session.logfile = sys.stderr yield session |