Merge commit 'e2073b0276226b625897ef475f225bf8f508719e' as 'triehash'

[apt.git] / test / integration / test-ubuntu-bug-1304403-obsolete-priority-standard

diff --git a/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard b/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
index 45f70a898aec9b6e5cf7b784a74b87aa94d6d66c..82e1d61e80b4e7351fb00857f18b77dea633026f 100755 (executable)
--- a/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
+++ b/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
@@ -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'


@@ -25,7 +25,7 @@ insertinstalledpackage 'not-downloadable' 'all' '1.0' '' 'standard'
 setupaptarchive
 
 # discourage keeping obsolete high-priority packages …
 setupaptarchive
 
 # discourage keeping obsolete high-priority packages …

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

 Building dependency tree...
 Calculating upgrade...
 The following packages will be REMOVED:
 Building dependency tree...
 Calculating upgrade...
 The following packages will be REMOVED:


@@ -42,7 +42,7 @@ for i in $(seq 1 10); do
 insertinstalledpackage "depender$i" 'all' '1.0' 'Depends: not-downloadable'
 done
 
 insertinstalledpackage "depender$i" 'all' '1.0' 'Depends: not-downloadable'
 done
 

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

 Building dependency tree...
 Calculating upgrade...
 The following packages have been kept back:
 Building dependency tree...
 Calculating upgrade...
 The following packages have been kept back: