properly format multiline error messages

[apt.git] / test / integration / test-apt-cache

diff --git a/test/integration/test-apt-cache b/test/integration/test-apt-cache
index 1d90eed5cb280ecc6638fd6e76b7b8a7b2315633..bff1667e80a44f7c514114e41d6df34191a891e3 100755 (executable)
--- 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'
@@ -34,6 +34,7 @@ testempty aptcache unmet dpkg
 testsuccess aptcache stats
 cp rootdir/tmp/testsuccess.output stats.output
 testsuccess test -s stats.output
+testfailureequal 'E: apt-cache stats does not take any arguments' aptcache stats foo
 testsuccess aptcache xvcg foo
 cp rootdir/tmp/testsuccess.output xvcg.output
 testsuccess test -s xvcg.output
@@ -45,16 +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" aptcache madison foo
+testsuccessequal "       foo |          1 | file:$(readlink -f .)/aptarchive unstable/main all Packages" aptcache madison foo
 
 ### depends
 
@@ -147,35 +148,36 @@ testsuccessequal 'bar
   Replaces: foo
   Breaks: <foo:i386>
   Replaces: <foo:i386>' aptcache depends bar --implicit
+
 testsuccessequal 'specific
   Depends: <bar:i386>
-  Depends: specific:amd64
-  Breaks: foo:amd64
+  Depends: <specific:amd64>
+    specific
+  Breaks: <foo:amd64>
   Replaces: <foo:i386>' aptcache depends specific
 testsuccessequal 'specific
   Depends: <bar:i386>
-  Depends: specific:amd64
-  Breaks: foo:amd64
+  Depends: <specific:amd64>
+    specific
+  Breaks: <foo:amd64>
   Replaces: <foo:i386>' aptcache depends specific --implicit
 
-## rdpends
+## rdepends
 
+# Note that specific does not appear in this list as it doesn't depend on foo,
+# but on an arch-specific foo!
 testsuccessequal 'foo
 Reverse Depends:
   bar
-  specific
   bar' aptcache rdepends foo
 testsuccessequal 'foo
 Reverse Depends:
   Breaks: bar
-  Breaks: specific
   Replaces: bar' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1
 testsuccessequal 'foo
 Reverse Depends:
   Breaks: bar (<< 1)
-  Breaks: specific (<< 1)
   Replaces: bar (<< 1)' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1 -o APT::Cache::ShowVersion=1
 testsuccessequal 'foo
 Reverse Depends:
-  Breaks: bar (<< 1)
-  Breaks: specific (<< 1)' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1 -o APT::Cache::ShowVersion=1 --important --breaks
+  Breaks: bar (<< 1)' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1 -o APT::Cache::ShowVersion=1 --important --breaks