From 71c8773b7db287f849f64526820e4246aacbc578 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Fri, 24 Feb 2017 14:27:43 +0000 Subject: [PATCH] linux-meta: add synthetic dependancy for snapd Signed-off-by: Andy Whitcroft --- britney2/policies/autopkgtest.py | 2 +- tests/test_autopkgtest.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py index 28c3b12..9e3dcb9 100644 --- a/britney2/policies/autopkgtest.py +++ b/britney2/policies/autopkgtest.py @@ -380,7 +380,7 @@ class AutopkgtestPolicy(BasePolicy): # Hardcode linux-meta → linux, lxc, glibc, systemd triggers until we get a more flexible # implementation: https://bugs.debian.org/779559 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: # does this have any image on this arch? for pkg_id in srcinfo.binaries: diff --git a/tests/test_autopkgtest.py b/tests/test_autopkgtest.py index ecbeb2c..363dca2 100755 --- a/tests/test_autopkgtest.py +++ b/tests/test_autopkgtest.py @@ -1884,6 +1884,8 @@ class T(TestBase): testsuite='autopkgtest') self.data.add('systemd', False, {'Testsuite-Triggers': 'linux-generic'}, 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-libc-dev', False, {'Source': 'linux'}, testsuite='autopkgtest') 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'}, 'linux': {'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': (False, {}),