tests: support spaces in path and TMPDIR

[apt.git] / test / integration / test-bug-611729-mark-as-manual

diff --git a/test/integration/test-bug-611729-mark-as-manual b/test/integration/test-bug-611729-mark-as-manual
index e3d454f97d46929429c96b42a4a6a2c0632cc66a..bd9af32b6b527a5f2d0eb1447917047719fe0262 100755 (executable)
--- a/test/integration/test-bug-611729-mark-as-manual
+++ b/test/integration/test-bug-611729-mark-as-manual
@@ -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"
 


@@ -34,17 +34,17 @@ testdpkgnotinstalled a
 testdpkginstalled b c
 testmarkedauto 'b'
 
 testdpkginstalled b c
 testmarkedauto 'b'
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 Reading state information...
 Building dependency tree...
 Reading state information...

-b is already the newest version.
+b is already the newest version (1.0).

 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b --only-upgrade
 testmarkedauto 'b'
 
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b --only-upgrade
 testmarkedauto 'b'
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 Reading state information...
 Building dependency tree...
 Reading state information...

-b is already the newest version.
+b is already the newest version (1.0).

 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b -d
 testmarkedauto 'b'
 
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b -d
 testmarkedauto 'b'
 


@@ -59,10 +59,10 @@ sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date:
 testfileequal 'rootdir/var/log/apt/history.log' '
 Reinstall: b:i386 (1.0)'
 
 testfileequal 'rootdir/var/log/apt/history.log' '
 Reinstall: b:i386 (1.0)'
 

-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 Reading state information...
 Building dependency tree...
 Reading state information...

-b is already the newest version.
+b is already the newest version (1.0).

 b set to manually installed.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b
 testmarkedauto
 b set to manually installed.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b
 testmarkedauto