diff options
| author | Jürg Billeter <j@bitron.ch> | 2020-01-13 11:29:04 +0100 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2020-01-13 11:31:14 +0100 |
| commit | d3c3833141fcc21c05ac286b8b64c4592c1a0b7f (patch) | |
| tree | 9794dae93d76ac946317b0178c9af97d09200844 | |
| parent | 0cf763ab40f94ec9377263a864b197a972213c84 (diff) | |
| download | buildstream-juerg/batch-command-logging.tar.gz | |
tests/integration/workspace.py: Relax assert for buildbox-runjuerg/batch-command-logging
When commands are batched, the failure message can't include the command
group label with buildbox-run.
| -rw-r--r-- | tests/integration/workspace.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/integration/workspace.py b/tests/integration/workspace.py index 372db672a..776a1a1a6 100644 --- a/tests/integration/workspace.py +++ b/tests/integration/workspace.py @@ -342,7 +342,6 @@ def test_workspace_missing_last_successful(cli, datafiles): # Check that we can still read failed workspace logs @pytest.mark.datafiles(DATA_DIR) @pytest.mark.skipif(not HAVE_SANDBOX, reason="Only available with a functioning sandbox") -@pytest.mark.xfail(HAVE_SANDBOX == "buildbox-run", reason="Individual commands are not logged with command batching") def test_workspace_failed_logs(cli, datafiles): project = str(datafiles) workspace = os.path.join(cli.directory, "failing_amhello") @@ -364,4 +363,5 @@ def test_workspace_failed_logs(cli, datafiles): # Assert that we can get the log assert log != "" fail_str = "FAILURE {}: Running build-commands".format(element_name) - assert fail_str in log + batch_fail_str = "FAILURE {}: Running commands".format(element_name) + assert fail_str in log or batch_fail_str in log |