Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental

[apt.git] / test / integration / test-bug-612958-use-dpkg-multiarch-config

diff --git a/test/integration/test-bug-612958-use-dpkg-multiarch-config b/test/integration/test-bug-612958-use-dpkg-multiarch-config
index 18b9646363a6527951e019bf52cbb4e1968c4157..9556a5aef51a193764830f895d1f3028849316fe 100755 (executable)
--- a/test/integration/test-bug-612958-use-dpkg-multiarch-config
+++ b/test/integration/test-bug-612958-use-dpkg-multiarch-config
@@ -5,22 +5,19 @@ TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 setupenvironment
 configarchitecture 'i386'
-setupaptarchive
-
-insertinstalledpackage 'libapt' 'i386' '1.0'
-insertinstalledpackage 'libapt' 'amd64' '1.0'
-insertinstalledpackage 'libapt' 'armel' '1.0'
 
 testpass() {
-       rm rootdir/var/cache/apt/*.bin
-       msgtest 'Test architecture handling' "$1 with $2"
-       aptcache show libapt:$2 2> /dev/null > /dev/null && msgpass || msgfail
+       msgtest 'Test architecture handling success' "$1 with $2"
+       rm -f archs.conf
+       aptconfig dump --no-empty --format='%V%n' APT::Architectures > archs.conf
+       testsuccess --nomsg grep "^$2\$" archs.conf
 }
 
 testfail() {
-       rm rootdir/var/cache/apt/*.bin
-       msgtest 'Test architecture handling' "$1 with $2"
-       aptcache show libapt:$2 2> /dev/null > /dev/null && msgfail || msgpass
+       msgtest 'Test architecture handling failure' "$1 with $2"
+       rm -f archs.conf
+       aptconfig dump --no-empty --format='%V%n' APT::Architectures > archs.conf
+       testfailure --nomsg grep "^$2\$" archs.conf
 }
 
 testpass 'no config' 'i386'
@@ -42,6 +39,15 @@ testpass 'apt config' 'armel'
 
 rm $CONFFILE
 
+echo '#clear APT::Architectures;' >> $CONFFILE
+echo 'APT::Architectures "i386,amd64";' >> $CONFFILE
+
+testpass 'apt config' 'i386'
+testpass 'apt config' 'amd64'
+testfail 'apt config' 'armel'
+
+rm $CONFFILE
+
 echo '#clear APT::Architectures;' >> $CONFFILE
 echo 'Dir::Bin::dpkg "./dpkg-printer";' >> $CONFFILE