do fail on weakhash/loop earlier in acquire

[apt.git] / test / integration / test-prefer-higher-priority-providers

diff --git a/test/integration/test-prefer-higher-priority-providers b/test/integration/test-prefer-higher-priority-providers
index 64b901dd01f32e700dbfe04e63fe1009509f808d..7c3f323742facb62ff1c41ba608d59a4f0d1f202 100755 (executable)
--- a/test/integration/test-prefer-higher-priority-providers
+++ b/test/integration/test-prefer-higher-priority-providers
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'native'
 
@@ -13,9 +13,9 @@ insertpackage 'unstable' 'awesome' 'all' '1' 'Depends: stuff'
 
 setupaptarchive
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
   foo
 The following NEW packages will be installed:
   awesome foo
@@ -25,7 +25,7 @@ Inst awesome (1 unstable [all])
 Conf foo (1 unstable [all])
 Conf awesome (1 unstable [all])' aptget install awesome -s
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   awesome foo
@@ -35,11 +35,11 @@ Inst awesome (1 unstable [all])
 Conf foo (1 unstable [all])
 Conf awesome (1 unstable [all])' aptget install awesome foo -s
 
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
 Building dependency tree...
 Package 'bar' is not installed, so not removed
 Package 'baz' is not installed, so not removed
-The following extra packages will be installed:
+The following additional packages will be installed:
   foo
 The following NEW packages will be installed:
   awesome foo
@@ -49,10 +49,10 @@ Inst awesome (1 unstable [all])
 Conf foo (1 unstable [all])
 Conf awesome (1 unstable [all])" aptget install awesome bar- baz- -s
 
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
 Building dependency tree...
 Package 'foo' is not installed, so not removed
-The following extra packages will be installed:
+The following additional packages will be installed:
   bar
 The following NEW packages will be installed:
   awesome bar
@@ -62,11 +62,11 @@ Inst awesome (1 unstable [all])
 Conf bar (1 unstable [all])
 Conf awesome (1 unstable [all])" aptget install awesome foo- -s
 
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
 Building dependency tree...
 Package 'foo' is not installed, so not removed
 Package 'baz' is not installed, so not removed
-The following extra packages will be installed:
+The following additional packages will be installed:
   bar
 The following NEW packages will be installed:
   awesome bar
@@ -76,11 +76,11 @@ Inst awesome (1 unstable [all])
 Conf bar (1 unstable [all])
 Conf awesome (1 unstable [all])" aptget install awesome foo- baz- -s
 
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
 Building dependency tree...
 Package 'foo' is not installed, so not removed
 Package 'bar' is not installed, so not removed
-The following extra packages will be installed:
+The following additional packages will be installed:
   baz
 The following NEW packages will be installed:
   awesome baz
@@ -90,7 +90,7 @@ Inst awesome (1 unstable [all])
 Conf baz (1 unstable [all])
 Conf awesome (1 unstable [all])" aptget install awesome foo- bar- -s
 
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
 Building dependency tree...
 Package 'foo' is not installed, so not removed
 Package 'bar' is not installed, so not removed