Merge branch 'debian/sid' 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..7bf5781e8b88bdca255f8175e70627237642f83c 100755 (executable)
--- a/test/integration/test-bug-612958-use-dpkg-multiarch-config
+++ b/test/integration/test-bug-612958-use-dpkg-multiarch-config
@@ -14,13 +14,13 @@ insertinstalledpackage 'libapt' 'armel' '1.0'
 testpass() {
        rm rootdir/var/cache/apt/*.bin
        msgtest 'Test architecture handling' "$1 with $2"
 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
+       testsuccess --nomsg aptcache show libapt:$2

 }
 
 testfail() {
        rm rootdir/var/cache/apt/*.bin
        msgtest 'Test architecture handling' "$1 with $2"
 }
 
 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
+       testfailure --nomsg aptcache show libapt:$2

 }
 
 testpass 'no config' 'i386'
 }
 
 testpass 'no config' 'i386'


@@ -42,6 +42,15 @@ testpass 'apt config' 'armel'
 
 rm $CONFFILE
 
 
 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
 
 echo '#clear APT::Architectures;' >> $CONFFILE
 echo 'Dir::Bin::dpkg "./dpkg-printer";' >> $CONFFILE