Merge ~ubuntu-release/britney/+git/britney2-ubuntu:dropped-tests into ~ubuntu-release/britney/+git/britney2-ubuntu:master

[Iain Lane]

We request tests of packages which have dropped their autopkgtest in unstable. Since we know whether a package has an autopkgtest or not, we can avoid doing this.

Current example is ncbi-tools6 in zesty-proposed.

There's a pass where we directly request tests of the migration item "foo" if it has a test. This bit is okay currently: it will not make a request if foo doesn't have a test in unstable. Then there is a second pass where we trigger test requests for sources which build binaries that depend on foo. I think this is where the problem arises - if foo builds libfoo1 and foo-tools which depends on libfoo1, we trigger a test of foo again even though this is what we are trying to migrate and it no longer has a test.

I think we should ignore foo at this second step - that's what this branch does.

diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py
index f06445d..28c3b12 100644
--- a/britney2/policies/autopkgtest.py
+++ b/britney2/policies/autopkgtest.py
@@ -352,6 +352,11 @@ class AutopkgtestPolicy(BasePolicy):
             for rdep in rdeps:
                 try:
                     rdep_src = binaries_info[rdep.package_name].source
+                    # Don't re-trigger the package itself here; this should
+                    # have been done above if the package still continues to
+                    # have an autopkgtest in unstable.
+                    if rdep_src == src:
+                        continue
                 except KeyError:
                     self.log('%s on %s has no source (NBS?)' % (rdep.package_name, arch))
                     continue
diff --git a/tests/test_autopkgtest.py b/tests/test_autopkgtest.py
index c982775..ecbeb2c 100755
--- a/tests/test_autopkgtest.py
+++ b/tests/test_autopkgtest.py
@@ -244,6 +244,37 @@ class T(TestBase):
         self.assertIn('accepted: darkgreen', upgrade_out)
         self.assertIn('SUCCESS (1/0)', upgrade_out)
 
+    def test_dropped_test_not_run(self):
+        '''New version of a package drops its autopkgtest'''
+
+        # green has passed on amd64 before
+        # lightgreen has passed on i386, therefore we should block on it returning
+        self.swift.set_results({'autopkgtest-series': {
+            'series/amd64/g/green/20150101_100000@': (0, 'green 4', tr('green/1')),
+            'series/i386/l/lightgreen/20150101_100100@': (0, 'lightgreen 1', tr('green/1')),
+        }})
+
+        self.do_test(
+            [('libgreen1', {'Version': '2', 'Source': 'green'}, None)],
+            {'green': (False, {'lightgreen': {'amd64': 'RUNNING-ALWAYSFAIL', 'i386': 'RUNNING'}})
+            },
+            {'green': [('old-version', '1'), ('new-version', '2'),
+                       ('reason', 'autopkgtest')]})
+
+        # we expect the package's reverse dependencies' tests to get triggered,
+        # but *not* the package itself since it has no autopkgtest any more
+        self.assertEqual(
+            self.amqp_requests,
+            set(['debci-series-i386:lightgreen {"triggers": ["green/2"]}',
+                 'debci-series-amd64:lightgreen {"triggers": ["green/2"]}',
+                 'debci-series-i386:darkgreen {"triggers": ["green/2"]}',
+                 'debci-series-amd64:darkgreen {"triggers": ["green/2"]}']))
+
+        # ... and that they get recorded as pending
+        expected_pending = {'green/2': {'darkgreen': ['amd64', 'i386'],
+                                        'lightgreen': ['amd64', 'i386']}}
+        self.assertEqual(self.pending_requests, expected_pending)
+
     def test_multi_rdepends_with_tests_all_running(self):
         '''Multiple reverse dependencies with tests (all running)'''