Merge ~cjwatson/britney/+git/britney2-ubuntu:testsuite-triggers-check-arch into ~ubuntu-release/britney/+git/britney2-ubuntu:master

[Colin Watson]

Check whether testsuite triggers have any binaries

We should only run autopkgtests for testsuite triggers if the source
package has any binaries on the relevant architecture, as otherwise it
should be expected to fail.

[Steve Langasek (vorlon)]

Doesn't this cause us to miss tests for arch: all packages that are meant to be tested on all archs?

review: Needs Information

[Colin Watson (cjwatson)]

Shouldn't do, because BinaryPackageId.architecture is set to the architecture of the Packages file that the binary's information was read from, not to the Architecture field of the binary itself. See britney.py:Britney._read_packages_file.

[Iain Lane (laney)]

On Tue, Jul 18, 2017 at 11:24:25AM -0000, Colin Watson wrote:
> Colin Watson has proposed merging ~cjwatson/britney/+git/britney2-ubuntu:testsuite-triggers-check-arch into ~ubuntu-release/britney/+git/britney2-ubuntu:master.
>
> Commit message:
> Check whether testsuite triggers have any binaries
>
> We should only run autopkgtests for testsuite triggers if the source
> package has any binaries on the relevant architecture, as otherwise it
> should be expected to fail.

I know this is merged, but for the record - I think this is worth a test
(tests/test_autopkgtest.py), to specify exactly what we want to happen
if nothing else.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py
index fac6860..2e8ee1e 100644
--- a/britney2/policies/autopkgtest.py
+++ b/britney2/policies/autopkgtest.py
@@ -375,8 +375,11 @@ class AutopkgtestPolicy(BasePolicy):
                     except KeyError:
                         continue
                     if 'autopkgtest' in tdep_src_info.testsuite or self.has_autodep8(tdep_src_info, binaries_info):
-                        tests.append((tdep_src, tdep_src_info[VERSION]))
-                        reported_pkgs.add(tdep_src)
+                        for pkg_id in tdep_src_info.binaries:
+                            if pkg_id.architecture == arch:
+                                tests.append((tdep_src, tdep_src_info[VERSION]))
+                                reported_pkgs.add(tdep_src)
+                                break
 
         # Hardcode linux-meta →  linux, lxc, glibc, systemd triggers until we get a more flexible
         # implementation: https://bugs.debian.org/779559