Merge branch 'variants-notice' into 'main'

variants: Do not report unsupported variants in repositories

See merge request apt-team/apt!546

1 files changed, 8 insertions, 4 deletions

diff --git a/test/integration/test-architecture-variants b/test/integration/test-architecture-variants
index e116720c9..5883d91a2 100755
--- a/test/integration/test-architecture-variants
+++ b/test/integration/test-architecture-variants
@@ -6,15 +6,19 @@ TESTDIR="$(readlink -f "$(dirname "$0")")"
 setupenvironment
 configarchitecture 'amd64'
 
-msgmsg "Test basic ordering scenarios"
-
-echo 'APT::Architecture-Variants { "amd64v3"; "amd64v2" }' > 'rootdir/etc/apt/apt.conf.d/variants'
+# Make sure not to add v1 to the repo. We want to test that unsupported variants are silently ignored.
+echo 'APT::Architecture-Variants { "amd64v3"; "amd64v2"; "amd64v1"; }' > 'rootdir/etc/apt/apt.conf.d/variants'
 insertpackage 'unstable' 'foo' 'amd64:amd64v2' '1'
 insertpackage 'unstable' 'foo' 'amd64' '1'
 insertpackage 'unstable' 'foo' 'amd64:amd64v3' '1'
 setupaptarchive  --no-update
 
-testsuccessequal "" aptget update -qq
+msgtest "Test that variants, particularly an unsupported amd64v1 variant does not produce a notice"
+testsuccess --nomsg apt update
+msgtest "Test that there is no unexpected output in apt-get update -qq"
+testsuccessequal --nomsg "" aptget update -qq
+
+msgmsg "Test basic ordering scenarios"
 
 testsuccessequal "foo:
   Installed: (none)