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

Autopkgtest.request(): Don't ignore excluded packages

Browse Source 
We already handle the exclusions in tests_for_source() (and run the testing
version if appropriate), so don't unconditionally skip requests for those.

Adjust the TestAutoPkgTest.test_rdepends_unbuilt case to catch that: The "run
britney once to pick up previous results" was a thinko as this already
satisfies all tests for green 2.
This commit is contained in:
Martin Pitt 2015-08-14 09:39:26 +02:00
parent 6c3dd0a3e2
commit 42e1ac635d
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
autopkgtest.py
View File

@ -414,9 +414,8 @@ class AutoPackageTest(object):
(['%s/%s' % i for i in packages], str(self.excludes))) (['%s/%s' % i for i in packages], str(self.excludes)))
for src, ver in packages: for src, ver in packages:
for (testsrc, testver) in self.tests_for_source(src, ver): for (testsrc, testver) in self.tests_for_source(src, ver):
if testsrc not in self.excludes: for arch in self.britney.options.adt_arches.split():
for arch in self.britney.options.adt_arches.split(): self.add_test_request(testsrc, testver, arch, src, ver)
self.add_test_request(testsrc, testver, arch, src, ver)
if self.britney.options.verbose: if self.britney.options.verbose:
for src, verinfo in self.requested_tests.items(): for src, verinfo in self.requested_tests.items():

15
tests/test_autopkgtest.py
View File

@ -374,16 +374,11 @@ lightgreen 1 i386 green 2
'series/i386/g/green/20150101_100200@': (0, 'green 2'), 'series/i386/g/green/20150101_100200@': (0, 'green 2'),
'series/amd64/g/green/20150101_100201@': (0, 'green 2'), 'series/amd64/g/green/20150101_100201@': (0, 'green 2'),
}}) }})
# run britney once to pick up previous results
self.do_test(
[('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')],
NOT_CONSIDERED)
os.unlink(self.fake_amqp)
# add unbuilt lightgreen; should run tests against the old version # add unbuilt lightgreen; should run tests against the old version
self.data.add_src('lightgreen', True, {'Version': '2', 'Testsuite': 'autopkgtest'}) self.data.add_src('lightgreen', True, {'Version': '2', 'Testsuite': 'autopkgtest'})
self.do_test( self.do_test(
[], [('libgreen1', {'Version': '2', 'Source': 'green', 'Depends': 'libc6'}, 'autopkgtest')],
NOT_CONSIDERED, NOT_CONSIDERED,
[r'\bgreen\b.*>1</a> to .*>2<', [r'\bgreen\b.*>1</a> to .*>2<',
r'\blightgreen\b.*>1</a> to .*>2<', r'\blightgreen\b.*>1</a> to .*>2<',
@ -393,8 +388,12 @@ lightgreen 1 i386 green 2
r'lightgreen has no up-to-date binaries on any arch'], r'lightgreen has no up-to-date binaries on any arch'],
['Valid candidate']) ['Valid candidate'])
# lightgreen's tests should not be triggered yet while it is unbuilt self.assertEqual(
self.assertEqual(self.amqp_requests, set()) self.amqp_requests,
set(['debci-series-i386:green', 'debci-series-amd64:green',
'debci-series-i386:lightgreen', 'debci-series-amd64:lightgreen',
'debci-series-i386:darkgreen', 'debci-series-amd64:darkgreen']))
os.unlink(self.fake_amqp)
# now lightgreen 2 gets built, should trigger a new test run # now lightgreen 2 gets built, should trigger a new test run
self.swift.set_results({'autopkgtest-series': { self.swift.set_results({'autopkgtest-series': {