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

autopkgtest: Trigger lxc tests from linux-meta*, not linux

Browse Source 
This is more consistent with the DKMS triggers, and will make things easier for
the kernel status matrix.
This commit is contained in:
Martin Pitt 2015-09-15 15:10:49 +02:00
parent b869202457
commit 6591d67c47
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autopkgtest.py
View File

@ -209,8 +209,12 @@ class AutoPackageTest(object):
# Hardcode linux → lxc trigger until we get a more flexible
# implementation: https://bugs.debian.org/779559
if src == 'linux' and 'lxc' not in reported_pkgs:
tests.append(('lxc', self.britney.sources['testing']['lxc'][VERSION]))
if src.startswith('linux-meta') and 'lxc' not in reported_pkgs:
try:
tests.append(('lxc', self.britney.sources['testing']['lxc'][VERSION]))
except KeyError:
# no lxc package in that series? *shrug*, then not
pass
tests.sort(key=lambda s_v: s_v[0])
return tests

6
tests/test_autopkgtest.py
View File

@ -1130,12 +1130,12 @@ fancy 1 i386 linux-meta-lts-grumpy 1
def test_kernel_triggers_lxc(self):
'''LXC test gets triggered by kernel uploads'''
self.data.add('lxc', False, {'Testsuite-Triggers': 'linux-libc-dev'},
self.data.add('lxc', False, {'Testsuite-Triggers': 'linux-generic'},
testsuite='autopkgtest')
self.do_test(
[('linux-libc-dev', {'Source': 'linux'}, None)],
{'linux': (False, {'lxc 1': {'amd64': 'RUNNING', 'i386': 'RUNNING'}})})
[('linux-generic', {'Source': 'linux-meta'}, None)],
{'linux-meta': (False, {'lxc 1': {'amd64': 'RUNNING', 'i386': 'RUNNING'}})})
def test_disable_adt(self):
'''Run without autopkgtest requests'''