Merge lp:~jibel/britney/do_not_test_untestable_packages into lp:~ubuntu-release/britney/britney2-ubuntu

[Jean-Baptiste Lallement]

Remove packages from the request file that are not valid for testing i.e excuse.run_autopkgtest = False.

This proposition of patch removes packages from the request file that have been identified by britney as invalid for testing.

For example package A is autopkgtest-able but FTBFS on i386 and depends on package B.
Britney identifies A as non-testable (excuse.run_autopkgtest = False) when B is uploaded it shouldn't start a test of A.
If test A starts, it will either fail or pass but test the wrong version and reconciliation of the test submission with the result will not be possible.

The case where a package is uploaded and not testable is already handled by britney.

[Colin Watson (cjwatson)]

This makes sense, on the grounds that once A later becomes a valid candidate it'll have its autopkgtests run then.

review: Approve

=== modified file 'autopkgtest.py'
--- autopkgtest.py	2013-10-20 21:29:00 +0000
+++ autopkgtest.py	2013-10-29 17:27:56 +0000
@@ -128,7 +128,10 @@
         command.extend(args)
         subprocess.check_call(command)
 
-    def request(self, packages):
+    def request(self, packages, excludes=None):
+        if excludes is None:
+            excludes = []
+
         self._ensure_rc_file()
         request_path = self._request_path
         if os.path.exists(request_path):
@@ -140,6 +143,22 @@
                 print("%s %s" % (src, ver), file=request_file)
             request_file.flush()
             self._adt_britney("request", "-O", request_path, request_file.name)
+
+        # Remove packages that have been identified as invalid candidates for
+        # testing from the request file i.e run_autopkgtest = False
+        with open(request_path, 'r') as request_file:
+            lines = request_file.readlines()
+        with open(request_path, 'w') as request_file:
+            for line in lines:
+                src = line.split()[0]
+                if not src in excludes:
+                    request_file.write(line)
+                else:
+                    if self.britney.options.verbose:
+                        print("I: [%s] - Requested autopkgtest for %s but "
+                              "run_autopkgtest set to False" %
+                              (time.asctime(), src))
+
         for linebits in self._parse(request_path):
             # Make sure that there's an entry in pkgcauses for each new
             # request, so that results() gives useful information without

=== modified file 'britney.py'
--- britney.py	2013-10-04 23:51:26 +0000
+++ britney.py	2013-10-29 17:27:56 +0000
@@ -1684,8 +1684,10 @@
                 self, self.options.adt_series, debug=adt_debug)
             autopkgtest_packages = []
             autopkgtest_excuses = []
+            autopkgtest_excludes = []
             for e in self.excuses:
                 if not e.run_autopkgtest:
+                    autopkgtest_excludes.append(e.name)
                     continue
                 # skip removals, binary-only candidates, and proposed-updates
                 if e.name.startswith("-") or "/" in e.name or "_" in e.name:
@@ -1694,7 +1696,7 @@
                     continue
                 autopkgtest_excuses.append(e)
                 autopkgtest_packages.append((e.name, e.ver[1]))
-            autopkgtest.request(autopkgtest_packages)
+            autopkgtest.request(autopkgtest_packages, autopkgtest_excludes)
             if not self.options.dry_run:
                 autopkgtest.submit()
                 autopkgtest.collect()