Qinusty pushed to branch Qinusty/retries-should-fail at BuildStream / buildstream
Commits:
4 changed files:
Changes:
| ... | ... | @@ -78,3 +78,7 @@ class Message(): |
| 78 | 78 |
self.creation_time = datetime.datetime.now()
|
| 79 | 79 |
if message_type in (MessageType.SUCCESS, MessageType.FAIL):
|
| 80 | 80 |
assert elapsed is not None
|
| 81 |
+ # logfile should always be associated with these messages
|
|
| 82 |
+ if (self.scheduler and
|
|
| 83 |
+ message_type in (MessageType.START, MessageType.SUCCESS, MessageType.FAIL, MessageType.SKIPPED)):
|
|
| 84 |
+ assert self.logfile, "START, SUCCESS, FAIL messages require logfile to be provided."
|
| ... | ... | @@ -56,7 +56,7 @@ def test_fetch_bad_url(cli, tmpdir, datafiles): |
| 56 | 56 |
result = cli.run(project=project, args=[
|
| 57 | 57 |
'fetch', 'target.bst'
|
| 58 | 58 |
])
|
| 59 |
- assert "Try #" in result.stderr
|
|
| 59 |
+ assert "FAILURE Try #" in result.stderr
|
|
| 60 | 60 |
result.assert_main_error(ErrorDomain.STREAM, None)
|
| 61 | 61 |
result.assert_task_error(ErrorDomain.SOURCE, None)
|
| 62 | 62 |
|
| ... | ... | @@ -67,7 +67,7 @@ def test_fetch_bad_url(cli, tmpdir, datafiles): |
| 67 | 67 |
result = cli.run(project=project, args=[
|
| 68 | 68 |
'fetch', 'target.bst'
|
| 69 | 69 |
])
|
| 70 |
- assert "Try #" in result.stderr
|
|
| 70 |
+ assert "FAILURE Try #" in result.stderr
|
|
| 71 | 71 |
result.assert_main_error(ErrorDomain.STREAM, None)
|
| 72 | 72 |
result.assert_task_error(ErrorDomain.SOURCE, None)
|
| 73 | 73 |
|
| ... | ... | @@ -53,7 +53,7 @@ def test_fetch_bad_url(cli, tmpdir, datafiles): |
| 53 | 53 |
result = cli.run(project=project, args=[
|
| 54 | 54 |
'fetch', 'target.bst'
|
| 55 | 55 |
])
|
| 56 |
- assert "Try #" in result.stderr
|
|
| 56 |
+ assert "FAILURE Try #" in result.stderr
|
|
| 57 | 57 |
result.assert_main_error(ErrorDomain.STREAM, None)
|
| 58 | 58 |
result.assert_task_error(ErrorDomain.SOURCE, None)
|
| 59 | 59 |
|
