linux-meta: add synthetic dependancy for snapd

Signed-off-by: Andy Whitcroft <apw@canonical.com>
email-direct-upload-sponsor
Andy Whitcroft 8 years ago
parent 766ed38d40
commit 71c8773b7d

@ -380,7 +380,7 @@ class AutopkgtestPolicy(BasePolicy):
# Hardcode linux-meta → linux, lxc, glibc, systemd triggers until we get a more flexible # Hardcode linux-meta → linux, lxc, glibc, systemd triggers until we get a more flexible
# implementation: https://bugs.debian.org/779559 # implementation: https://bugs.debian.org/779559
if src.startswith('linux-meta'): if src.startswith('linux-meta'):
for pkg in ['lxc', 'lxd', 'glibc', src.replace('linux-meta', 'linux'), 'systemd']: for pkg in ['lxc', 'lxd', 'glibc', src.replace('linux-meta', 'linux'), 'systemd', 'snapd']:
if pkg not in reported_pkgs: if pkg not in reported_pkgs:
# does this have any image on this arch? # does this have any image on this arch?
for pkg_id in srcinfo.binaries: for pkg_id in srcinfo.binaries:

@ -1884,6 +1884,8 @@ class T(TestBase):
testsuite='autopkgtest') testsuite='autopkgtest')
self.data.add('systemd', False, {'Testsuite-Triggers': 'linux-generic'}, self.data.add('systemd', False, {'Testsuite-Triggers': 'linux-generic'},
testsuite='autopkgtest') testsuite='autopkgtest')
self.data.add('snapd2', False, {'Testsuite-Triggers': 'linux-generic'},
testsuite='autopkgtest')
self.data.add('linux-image-1', False, {'Source': 'linux'}, testsuite='autopkgtest') self.data.add('linux-image-1', False, {'Source': 'linux'}, testsuite='autopkgtest')
self.data.add('linux-libc-dev', False, {'Source': 'linux'}, testsuite='autopkgtest') self.data.add('linux-libc-dev', False, {'Source': 'linux'}, testsuite='autopkgtest')
self.data.add('linux-image', False, {'Source': 'linux-meta', 'Depends': 'linux-image-1'}) self.data.add('linux-image', False, {'Source': 'linux-meta', 'Depends': 'linux-image-1'})
@ -1902,6 +1904,7 @@ class T(TestBase):
'glibc': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'glibc': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'linux': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'linux': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'systemd': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'}, 'systemd': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
'snapd': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING-ALWAYSFAIL'},
}), }),
'linux-meta-64only': (False, {'lxc': {'amd64': 'RUNNING'}}), 'linux-meta-64only': (False, {'lxc': {'amd64': 'RUNNING'}}),
'linux': (False, {}), 'linux': (False, {}),

Loading…
Cancel
Save