[pkg-gnupg-maint] Bug#953570: gnupg2: Please make autopkgtests cross-test-friendly

[Steve Langasek]

Package: gnupg2
Version: 2.2.19-3
Severity: minor
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Dear maintainers,

In Ubuntu, we are in the process of moving the i386 architecture to a
compatibility-only layer on amd64, and therefore we are also moving our
autopkgtest infrastructure to test i386 binaries in a cross-environment.

This requires changes to some tests so that they are cross-aware and can do
the right thing.

The gnupg2 tests currently fail in this environment, because they declare a
test dependency on diffutils, which forces the testbed to try to remove the
essential diffutils package in favor of the foreign-arch diffutils:i386, and
apt rightly objects.

Because diffutils is essential, I think a test dependency doesn't need to be
declared, so I have uploaded the attached patch to Ubuntu to fix this test
failure.  However, if you think the diffutils test dependency is necessary,
I would suggest declaring this as diffutils:native instead.

Note that upstream autopkgtest doesn't currently set DEB_HOST_ARCH so this
is a complete no-op in Debian for the moment.  Support for cross-testing in
autopkgtest is currently awaiting review at
https://salsa.debian.org/ci-team/autopkgtest/merge_requests/69 and once
landed, will still have no effect unless autopkgtest is invoked with a '-a'
option.  So this change should be safe to land in your package despite this
not being upstream in autopkgtest.

Thanks for considering,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru gnupg2-2.2.19/debian/tests/control gnupg2-2.2.19/debian/tests/control
--- gnupg2-2.2.19/debian/tests/control	2020-02-27 13:27:37.000000000 -0800
+++ gnupg2-2.2.19/debian/tests/control	2020-03-10 02:59:47.000000000 -0700
@@ -7,5 +7,5 @@
 Restrictions: allow-stderr
 
 Tests: migration
-Depends: gpg, gnupg1, gnupg-utils, debian-archive-keyring, diffutils
+Depends: gpg, gnupg1, gnupg-utils, debian-archive-keyring
 Restrictions: allow-stderr