[Pkg-utopia-maintainers] Bug#948617: bubblewrap: Please make autopkgtests cross-test-friendly.

[Steve Langasek]

Package: bubblewrap
Version: 0.4.0-1
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 bubblewrap tests currently fail in this environment, because they try to
install test dependencies for the target architecture rather than for the
host architecture.  The attached patch allows the dependencies to be
satisfied using the host versions of various core packages, letting the i386
tests successfully run on an amd64 host.

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 bubblewrap-0.4.0/debian/tests/control bubblewrap-0.4.0/debian/tests/control
--- bubblewrap-0.4.0/debian/tests/control	2019-11-28 03:14:41.000000000 -0800
+++ bubblewrap-0.4.0/debian/tests/control	2020-01-10 10:31:02.000000000 -0800
@@ -7,21 +7,21 @@
 Restrictions: allow-stderr, isolation-machine
 Depends:
  bubblewrap,
- iproute2,
- libcap2-bin,
- libipc-run-perl,
- perl,
- python3,
+ iproute2:native,
+ libcap2-bin:native,
+ libipc-run-perl:native,
+ perl:native,
+ python3:native,
 
 Tests: upstream-usrmerge
 Restrictions: allow-stderr, isolation-machine, breaks-testbed
 Depends:
  bubblewrap,
- iproute2,
- libcap2-bin,
- libipc-run-perl,
- perl,
- python3,
+ iproute2:native,
+ libcap2-bin:native,
+ libipc-run-perl:native,
+ perl:native,
+ python3:native,
  usrmerge
 
 Tests:
@@ -29,8 +29,8 @@
 Restrictions: allow-stderr, isolation-machine, needs-root
 Depends:
  bubblewrap,
- iproute2,
- libcap2-bin,
- libipc-run-perl,
- perl,
- python3,
+ iproute2:native,
+ libcap2-bin:native,
+ libipc-run-perl:native,
+ perl:native,
+ python3:native,