mirror of
https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu
synced 2025-05-13 11:31:38 +00:00
Add test case for previous commit
This commit is contained in:
parent
e3ad79bdfb
commit
3ce7dc3d84
@ -60,10 +60,11 @@ class SwiftHTTPRequestHandler(BaseHTTPRequestHandler):
|
|||||||
ti.size = len(contents)
|
ti.size = len(contents)
|
||||||
results.addfile(ti, io.BytesIO(contents))
|
results.addfile(ti, io.BytesIO(contents))
|
||||||
# add testpkg-version
|
# add testpkg-version
|
||||||
contents = pkgver.encode()
|
if pkgver is not None:
|
||||||
ti = tarfile.TarInfo('testpkg-version')
|
contents = pkgver.encode()
|
||||||
ti.size = len(contents)
|
ti = tarfile.TarInfo('testpkg-version')
|
||||||
results.addfile(ti, io.BytesIO(contents))
|
ti.size = len(contents)
|
||||||
|
results.addfile(ti, io.BytesIO(contents))
|
||||||
self.wfile.write(tar.getvalue())
|
self.wfile.write(tar.getvalue())
|
||||||
|
|
||||||
def list_container(self, container, query):
|
def list_container(self, container, query):
|
||||||
|
@ -100,10 +100,10 @@ echo "$@" >> /%s/adt-britney.log ''' % self.data.path)
|
|||||||
|
|
||||||
if excuses_expect:
|
if excuses_expect:
|
||||||
for re in excuses_expect:
|
for re in excuses_expect:
|
||||||
self.assertRegexpMatches(excuses, re)
|
self.assertRegexpMatches(excuses, re, excuses)
|
||||||
if excuses_no_expect:
|
if excuses_no_expect:
|
||||||
for re in excuses_no_expect:
|
for re in excuses_no_expect:
|
||||||
self.assertNotRegexpMatches(excuses, re)
|
self.assertNotRegexpMatches(excuses, re, excuses)
|
||||||
|
|
||||||
self.amqp_requests = set()
|
self.amqp_requests = set()
|
||||||
try:
|
try:
|
||||||
@ -297,6 +297,26 @@ lightgreen 2 i386 lightgreen 2
|
|||||||
'''
|
'''
|
||||||
self.assertEqual(self.pending_requests, expected_pending)
|
self.assertEqual(self.pending_requests, expected_pending)
|
||||||
|
|
||||||
|
def test_tmpfail(self):
|
||||||
|
'''tmpfail result is considered a failure'''
|
||||||
|
|
||||||
|
# one tmpfail result without testpkg-version
|
||||||
|
self.swift.set_results({'autopkgtest-series': {
|
||||||
|
'series/i386/l/lightgreen/20150101_100101@': (16, None),
|
||||||
|
'series/amd64/l/lightgreen/20150101_100101@': (16, 'lightgreen 2'),
|
||||||
|
}})
|
||||||
|
|
||||||
|
self.do_test(
|
||||||
|
[('lightgreen', {'Version': '2', 'Depends': 'libgreen1 (>= 1)'}, 'autopkgtest')],
|
||||||
|
# FIXME: while we only submit requests through AMQP, but don't consider
|
||||||
|
# their results, we don't expect this to hold back stuff.
|
||||||
|
VALID_CANDIDATE,
|
||||||
|
[r'\blightgreen\b.*>1</a> to .*>2<',
|
||||||
|
r'autopkgtest for lightgreen 2: .*amd64.*Regression.*i386.*Regression'],
|
||||||
|
['in progress'])
|
||||||
|
|
||||||
|
self.assertEqual(self.pending_requests, '')
|
||||||
|
|
||||||
def test_no_amqp_config(self):
|
def test_no_amqp_config(self):
|
||||||
'''Run without autopkgtest requests'''
|
'''Run without autopkgtest requests'''
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user