X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/7414af7fa88164209eec9c585b8d175c1618ecbc..8d1cb6da6e21302c654da3f09de3975af7e4a11f:/test/integration/test-apt-cache?ds=sidebyside

diff --git a/test/integration/test-apt-cache b/test/integration/test-apt-cache
index c254aa602..bff1667e8 100755
--- a/test/integration/test-apt-cache
+++ b/test/integration/test-apt-cache
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 
 setupenvironment
 configarchitecture 'amd64' 'i386'
@@ -46,17 +46,16 @@ testsuccess aptcache dump
 cp rootdir/tmp/testsuccess.output dump.output
 testsuccess test -s dump.output
 
-testsuccessequal 'dpkg
-bar
+testsuccessequal 'bar
+foo
+dpkg
 specific
-fancy
-foo' aptcache pkgnames
+fancy' aptcache pkgnames
 testsuccessequal 'bar' aptcache pkgnames bar
-testsuccessequal 'fancy
-foo' aptcache pkgnames f
+testsuccessequal 'foo
+fancy' aptcache pkgnames f
 
-testsuccessequal "       foo |          1 | file:$(readlink -f .)/aptarchive unstable/main amd64 Packages
-       foo |          1 | file:$(readlink -f .)/aptarchive unstable/main i386 Packages" aptcache madison foo
+testsuccessequal "       foo |          1 | file:$(readlink -f .)/aptarchive unstable/main all Packages" aptcache madison foo
 
 ### depends
 
@@ -121,9 +120,12 @@ bar
   Depends: bar
   Breaks: foo
   Replaces: foo
+  Breaks: <foo:i386>
+  Replaces: <foo:i386>
 <foobar>
 <cool>
-<cooler>' aptcache depends foo --recurse --implicit
+<cooler>
+<foo:i386>' aptcache depends foo --recurse --implicit
 testsuccessequal 'foo
   Depends: bar
 bar
@@ -133,7 +135,9 @@ testsuccessequal 'foo
   Depends: bar
 bar
   Depends: bar
-  Replaces: foo' aptcache depends foo --recurse --important --replaces --implicit
+  Replaces: foo
+  Replaces: <foo:i386>
+<foo:i386>' aptcache depends foo --recurse --important --replaces --implicit
 testsuccessequal 'bar
   Depends: bar
   Breaks: foo
@@ -141,7 +145,9 @@ testsuccessequal 'bar
 testsuccessequal 'bar
   Depends: bar
   Breaks: foo
-  Replaces: foo' aptcache depends bar --implicit
+  Replaces: foo
+  Breaks: <foo:i386>
+  Replaces: <foo:i386>' aptcache depends bar --implicit
 
 testsuccessequal 'specific
   Depends: <bar:i386>