correct cross & disappear progress detection

[apt.git] / test / integration / test-apt-cli-list

diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list
index d3c44e1262406f5105dcb41308683916fa45bcdc..f87208a082f692478b562a29ff9e9caa3888b4f5 100755 (executable)
--- a/test/integration/test-apt-cli-list
+++ b/test/integration/test-apt-cli-list
@@ -1,18 +1,12 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 
 setupenvironment
 configarchitecture "i386"
 
 
 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'
 
 insertpackage 'unstable' 'foo' 'all' '1.0'
 insertinstalledpackage 'bar' 'i386' '1.0'
 


@@ -25,11 +19,10 @@ insertpackage 'unstable' 'baz' 'all' '2.0'
 
 setupaptarchive
 
 
 setupaptarchive
 

-APTARCHIVE=$(readlink -f ./aptarchive)
-

 testsuccessequal "Listing...
 bar/now 1.0 i386 [installed,local]
 baz/unstable 2.0 all [upgradable from: 0.1]
 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
 
 foo/unstable 1.0 all
 foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list
 


@@ -46,6 +39,7 @@ foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list --upgradable
 testsuccessequal "Listing...
 bar/now 1.0 i386 [installed,local]
 baz/now 0.1 all [installed,upgradable to: 2.0]
 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
 
 testsuccessequal "Listing...
 foobar/now 1.0 i386 [installed,upgradable to: 2.0]" apt list --installed
 
 testsuccessequal "Listing...


@@ -69,6 +63,11 @@ conf-only/now 1.0 i386 [residual-config]" apt list conf-only
 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]
 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
 testsuccessequal 'bar - 1.0 - 1.0
 
 # test format strings for machine parseable output
 testsuccessequal 'bar - 1.0 - 1.0