Merge remote-tracking branch 'mvo/debian/sid' into debian/sid

[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..4d1f00ca056fa72ece2a81725deea5b8b3834109 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"
-       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"
-       aptcache show libapt:$2 2> /dev/null > /dev/null && msgfail || msgpass
+       testfailure --nomsg aptcache show libapt:$2
 }
 
 testpass 'no config' 'i386'