summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRaoul Hidalgo Charman <raoul.hidalgocharman@codethink.co.uk>2019-03-14 12:26:03 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2019-03-25 11:46:44 +0000
commitdf23ea3ee58334569744ebeef9cfc729c2ddafc4 (patch)
treec48f7103cb0fee7bca3c56470e4be2aa7027c313 /tests
parent46bc1d597cb14e3971a642a8cb99a58e58ca6893 (diff)
downloadbuildstream-df23ea3ee58334569744ebeef9cfc729c2ddafc4.tar.gz
sourcepushqueue.py: Add queue for pushing sources
Updates other queues and widget to have consistent naming and display, and tests have been updated to reflect this. Part of #440
Diffstat (limited to 'tests')
-rw-r--r--tests/artifactcache/expiry.py4
-rw-r--r--tests/frontend/buildtrack.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/artifactcache/expiry.py b/tests/artifactcache/expiry.py
index 38c0e21f0..7ada656ab 100644
--- a/tests/artifactcache/expiry.py
+++ b/tests/artifactcache/expiry.py
@@ -435,10 +435,10 @@ def test_cleanup_first(cli, datafiles):
res = cli.run(project=project, args=['build', 'target2.bst'])
res.assert_success()
- # Find all of the activity (like push, pull, fetch) lines
+ # Find all of the activity (like push, pull, src-pull) lines
results = re.findall(r'\[.*\]\[.*\]\[\s*(\S+):.*\]\s*START\s*.*\.log', res.stderr)
- # Don't bother checking the order of 'fetch', it is allowed to start
+ # Don't bother checking the order of 'src-pull', it is allowed to start
# before or after the initial cache size job, runs in parallel, and does
# not require ResourceType.CACHE.
results.remove('fetch')
diff --git a/tests/frontend/buildtrack.py b/tests/frontend/buildtrack.py
index 2d8d0e383..5a3781dc6 100644
--- a/tests/frontend/buildtrack.py
+++ b/tests/frontend/buildtrack.py
@@ -303,11 +303,11 @@ def test_build_track_track_first(cli, datafiles, tmpdir, strict):
# Assert that 1.bst successfully tracks before 0.bst builds
track_messages = re.finditer(r'\[track:1.bst\s*]', result.stderr)
- build_0 = re.search(r'\[build:0.bst\s*] START', result.stderr).start()
+ build_0 = re.search(r'\[\s*build:0.bst\s*] START', result.stderr).start()
assert all(track_message.start() < build_0 for track_message in track_messages)
# Assert that 2.bst is *only* rebuilt if we are in strict mode
- build_2 = re.search(r'\[build:2.bst\s*] START', result.stderr)
+ build_2 = re.search(r'\[\s*build:2.bst\s*] START', result.stderr)
if strict == '--strict':
assert build_2 is not None
else: