Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-11 10:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

swift result download: Correctly handle "204 No content" status

Browse Source
This commit is contained in:
Martin Pitt 2015-07-14 08:34:46 +02:00
parent cb66355e95
commit ffe0a99db1
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autopkgtest.py
View File

@ -269,6 +269,8 @@ class AutoPackageTest(object):
f = urlopen(url) f = urlopen(url)
if f.getcode() == 200: if f.getcode() == 200:
result_paths = f.read().strip().splitlines() result_paths = f.read().strip().splitlines()
elif f.getcode() == 204: # No content
result_paths = []
else: else:
self.log_error('Failure to fetch swift results from %s: %u' % self.log_error('Failure to fetch swift results from %s: %u' %
(url, f.getcode())) (url, f.getcode()))

2
tests/mock_swift.py
View File

@ -85,7 +85,7 @@ class SwiftHTTPRequestHandler(BaseHTTPRequestHandler):
find_adapter = lambda i: (i >= 0) and (i + 1) or None find_adapter = lambda i: (i >= 0) and (i + 1) or None
objs = set([o[:find_adapter(o.find(d))] for o in objs]) objs = set([o[:find_adapter(o.find(d))] for o in objs])
self.send_response(200) self.send_response(objs and 200 or 204) # 204: "No Content"
self.send_header('Content-type', 'text/plain') self.send_header('Content-type', 'text/plain')
self.end_headers() self.end_headers()
self.wfile.write(('\n'.join(sorted(objs)) + '\n').encode('UTF-8')) self.wfile.write(('\n'.join(sorted(objs)) + '\n').encode('UTF-8'))

5
tests/test_autopkgtest.py
View File

@ -247,7 +247,7 @@ lightgreen 1 i386 green 2
'series/amd64/g/green/20150101_100201@': (4, 'green 2'), 'series/amd64/g/green/20150101_100201@': (4, 'green 2'),
}}) }})
self.do_test( out = self.do_test(
[], [],
# FIXME: while we only submit requests through AMQP, but don't consider # FIXME: while we only submit requests through AMQP, but don't consider
# their results, we don't expect this to hold back stuff. # their results, we don't expect this to hold back stuff.
@ -257,6 +257,9 @@ lightgreen 1 i386 green 2
r'autopkgtest for lightgreen 1: .*amd64.*Regression.*i386.*in progress', r'autopkgtest for lightgreen 1: .*amd64.*Regression.*i386.*in progress',
r'autopkgtest for darkgreen 1: .*amd64.*in progress.*i386.*Pass']) r'autopkgtest for darkgreen 1: .*amd64.*in progress.*i386.*Pass'])
# not expecting any failures to retrieve from swift
self.assertNotIn('Failure', out, out)
# there should be some pending ones # there should be some pending ones
self.assertIn('darkgreen 1 amd64 green 2', self.pending_requests) self.assertIn('darkgreen 1 amd64 green 2', self.pending_requests)
self.assertIn('lightgreen 1 i386 green 2', self.pending_requests) self.assertIn('lightgreen 1 i386 green 2', self.pending_requests)