summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2020-02-03 18:43:45 +0000
committerJürg Billeter <j@bitron.ch>2020-02-03 18:43:45 +0000
commit5e169159ebf45cabaf168bdf8b0e3c9d1e019bb5 (patch)
treea04bcff4b350ac9263f542972f88c61b307e32c9
parentdb6207f49419d272be28527e3c5c9b1ef5c2ecdd (diff)
parent01943aff2f468d0ad151645b4a8e4ebcb8570852 (diff)
downloadbuildstream-5e169159ebf45cabaf168bdf8b0e3c9d1e019bb5.tar.gz
Merge branch 'juerg/buildbox-run-test' into 'master'
tests/integration/interactive_build.py: Relax expect for buildbox-run See merge request BuildStream/buildstream!1801
-rw-r--r--tests/integration/interactive_build.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/integration/interactive_build.py b/tests/integration/interactive_build.py
index 9c832814d..c0b087126 100644
--- a/tests/integration/interactive_build.py
+++ b/tests/integration/interactive_build.py
@@ -53,7 +53,6 @@ def test_failed_build_quit(element_name, build_session, choice):
@pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox")
-@pytest.mark.xfail(HAVE_SANDBOX == "buildbox-run", reason="Not working with BuildBox")
@pytest.mark.datafiles(DATA_DIR)
@pytest.mark.parametrize("element_name", ["interactive/failed-build.bst"])
def test_failed_build_log(element_name, build_session):
@@ -64,7 +63,7 @@ def test_failed_build_log(element_name, build_session):
build_session.sendline(os.linesep * 20)
# Assert that we got something from the logs
- build_session.expect_exact("FAILURE interactive/failed-build.bst: Running build-commands")
+ build_session.expect("FAILURE interactive/failed-build.bst: Running (build-)?commands")
# Quit the pager
build_session.send("q")