X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/165760012d624ffcf098e1fd08fecde78f808fa7..2906182db398419a9c59a928b7ae73cf7c7aa307:/test/integration/test-apt-cli-list?ds=inline

diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list
index 1487afd55..f87208a08 100755
--- a/test/integration/test-apt-cli-list
+++ b/test/integration/test-apt-cli-list
@@ -1,18 +1,12 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 
 setupenvironment
 configarchitecture "i386"
 
-if [ ! -x ${BUILDDIRECTORY}/apt ]; then
-    msgmsg "No ${BUILDDIRECTORY}/apt"
-    msgskip 
-    exit 0
-fi
-
 insertpackage 'unstable' 'foo' 'all' '1.0'
 insertinstalledpackage 'bar' 'i386' '1.0'
 
@@ -25,52 +19,56 @@ insertpackage 'unstable' 'baz' 'all' '2.0'
 
 setupaptarchive
 
-APTARCHIVE=$(readlink -f ./aptarchive)
-
-testequal "Listing...
+testsuccessequal "Listing...
 bar/now 1.0 i386 [installed,local]
 baz/unstable 2.0 all [upgradable from: 0.1]
+dpkg/now 1.16.2+fake all [installed,local]
 foo/unstable 1.0 all
 foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list
 
-testequal "Listing...
+testsuccessequal "Listing...
 foo/unstable 1.0 all
 foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list "foo*"
 
-testequal "Listing...
+testsuccessequal "Listing...
 baz/unstable 2.0 all [upgradable from: 0.1]
 foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list --upgradable
 
 # FIXME: hm, hm - does it make sense to have this different? shouldn't
 #        we use "installed,upgradable" consitently?
-testequal "Listing...
+testsuccessequal "Listing...
 bar/now 1.0 i386 [installed,local]
 baz/now 0.1 all [installed,upgradable to: 2.0]
+dpkg/now 1.16.2+fake all [installed,local]
 foobar/now 1.0 i386 [installed,upgradable to: 2.0]" apt list --installed
 
-testequal "Listing...
+testsuccessequal "Listing...
 bar/now 1.0 i386 [installed,local]
 
 foobar/unstable 2.0 i386 [upgradable from: 1.0]
 foobar/now 1.0 i386 [installed,upgradable to: 2.0]
 " apt list bar foobar --all-versions
 
-testequal "Listing...
+testsuccessequal "Listing...
 bar/now 1.0 i386 [installed,local]
   an autogenerated dummy bar=1.0/installed
 " apt list bar --verbose
 
 # test for dpkg ^rc state
 insertinstalledpackage 'conf-only' 'i386' '1.0' '' '' 'deinstall ok config-files'
-testequal "Listing...
+testsuccessequal "Listing...
 conf-only/now 1.0 i386 [residual-config]" apt list conf-only
 
 # ensure that the users learns about multiple versions too
-testequal "Listing...
+testsuccessequal "Listing...
 baz/unstable 2.0 all [upgradable from: 0.1]
 N: There are 2 additional versions. Please use the '-a' switch to see them." apt list baz -o quiet=0
+testsuccessequal 'Listing...
+baz/unstable 2.0 all [upgradable from: 0.1]
+baz/testing 1.0 all
+baz/now 0.1 all [installed,upgradable to: 2.0]
+' apt list baz -o quiet=0 -a
 
 # test format strings for machine parseable output
-apt list -qq bar baz  -o APT::Cmd::use-format=true  -o APT::Cmd::format="\${Package} - \${installed:Version} - \${candidate:Version}" > output.txt
-testequal "bar - 1.0 - 1.0
-baz - 0.1 - 2.0" cat output.txt
+testsuccessequal 'bar - 1.0 - 1.0
+baz - 0.1 - 2.0' apt list -qq bar baz  -o APT::Cmd::use-format=true  -o APT::Cmd::format="\${Package} - \${installed:Version} - \${candidate:Version}"