Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-02-13 15:37:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

autopkgtest: Request separate tests for linux-meta* triggers

Browse Source 
If a package gets triggered by several sources, we can ordinarily run just one
test for all triggers. But for proposed kernels we want to run a separate test
for each, so that the test can run under that particular kernel.
This commit is contained in:
Martin Pitt 2015-09-14 16:07:44 +02:00
parent 16f4d7c8b2
commit 2aa0948250
2 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
autopkgtest.py
View File

@ -462,12 +462,23 @@ class AutoPackageTest(object):
return res
def _trigsources(verinfo):
res = set()
'''Calculate the triggers for a given verinfo map
verinfo is ver -> arch -> {(triggering-src1, ver1), ...}, i. e. an
entry of self.requested_tests[arch]
Return pair of ({kernel_trigger1, ...}, {nonkernel_trigger1, ...}) sets.
'''
kernel_triggers = set()
nonkernel_triggers = set()
for archinfo in verinfo.values():
for triggers in archinfo.values():
for (t, v) in triggers:
res.add(t)
return res
if t.startswith('linux-meta'):
kernel_triggers.add(t)
else:
nonkernel_triggers.add(t)
return (kernel_triggers, nonkernel_triggers)
# build per-queue request strings for new test requests
# TODO: Once we support version constraints in AMQP requests, add them
@ -477,8 +488,17 @@ class AutoPackageTest(object):
requests = []
for pkg, verinfo in self.requested_tests.items():
if arch in _arches(verinfo):
params = {'triggers': sorted(_trigsources(verinfo))}
requests.append((pkg, json.dumps(params)))
# if a package gets triggered by several sources, we can
# run just one test for all triggers; but for proposed
# kernels we want to run a separate test for each, so that
# the test runs under that particular kernel
kernel_triggers, other_triggers = _trigsources(verinfo)
for kt in sorted(kernel_triggers):
params = {'triggers': [kt]}
requests.append((pkg, json.dumps(params)))
if other_triggers:
params = {'triggers': sorted(other_triggers)}
requests.append((pkg, json.dumps(params)))
arch_queues[arch] = ('debci-%s-%s' % (self.series, arch), requests)
amqp_url = self.britney.options.adt_amqp

16
tests/test_autopkgtest.py
View File

@ -1111,6 +1111,22 @@ lightgreen 1 i386 green 3
'linux-meta-lts-grumpy': (False, {'fancy 1': {'amd64': 'RUNNING', 'i386': 'RUNNING'}})
})
# one separate test should be triggered for each kernel
self.assertEqual(
self.amqp_requests,
set(['debci-series-i386:fancy {"triggers": ["linux-meta"]}',
'debci-series-amd64:fancy {"triggers": ["linux-meta"]}',
'debci-series-i386:fancy {"triggers": ["linux-meta-lts-grumpy"]}',
'debci-series-amd64:fancy {"triggers": ["linux-meta-lts-grumpy"]}']))
# ... and that they get recorded as pending
expected_pending = '''fancy 1 amd64 linux-meta 1
fancy 1 amd64 linux-meta-lts-grumpy 1
fancy 1 i386 linux-meta 1
fancy 1 i386 linux-meta-lts-grumpy 1
'''
self.assertEqual(self.pending_requests, expected_pending)
def test_kernel_triggers_lxc(self):
'''LXC test gets triggered by kernel uploads'''