properly format multiline error messages

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

diff --git a/test/integration/test-apt-cli-update b/test/integration/test-apt-cli-update
index 83cc94b93b7de39201ee16ea0932fa218186ed65..b423072c369652ef873dd757b170d4ca58bf009c 100755 (executable)
--- a/test/integration/test-apt-cli-update
+++ b/test/integration/test-apt-cli-update
@@ -1,8 +1,8 @@
 #!/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"


@@ -13,12 +13,10 @@ insertinstalledpackage 'foo' 'all' '1.0'
 
 setupaptarchive --no-update
 
 
 setupaptarchive --no-update
 

-APTARCHIVE=$(readlink -f ./aptarchive)
+testfailuremsg 'E: The update command takes no arguments' apt update arguments

 
 

-testequal 'E: The update command takes no arguments' apt update -q arguments
-
-testequal "1 package can be upgraded. Run 'apt list --upgradable' to see it." apt update -q
+testsuccessequal "1 package can be upgraded. Run 'apt list --upgradable' to see it." apt update -qq

 
 cp dpkg.status rootdir/var/lib/dpkg/status
 insertinstalledpackage 'foo' 'all' '2.0'
 
 cp dpkg.status rootdir/var/lib/dpkg/status
 insertinstalledpackage 'foo' 'all' '2.0'

-testequal 'All packages are up to date.' apt update -q
+testsuccessequal 'All packages are up to date.' apt update -qq