implement generic config fallback for methods

[apt.git] / test / integration / test-pin-non-existent-package

diff --git a/test/integration/test-pin-non-existent-package b/test/integration/test-pin-non-existent-package
index c567e528569fe2ff7b62f60734f0a6fc43b218fd..06103fd389c85425e5d6f579ae5614e920ff13ee 100755 (executable)
--- a/test/integration/test-pin-non-existent-package
+++ b/test/integration/test-pin-non-existent-package
@@ -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"
 


@@ -23,8 +23,8 @@ testcandidate() {
 }
 
 testcandidate rapt '0.8.15'
 }
 
 testcandidate rapt '0.8.15'

-testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
-testequal 'Reading package lists...
+testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 Calculating upgrade...
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only
 Building dependency tree...
 Calculating upgrade...
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only


@@ -34,8 +34,8 @@ Pin: release a=unstable
 Pin-Priority: -1' > rootdir/etc/apt/preferences
 
 testcandidate rapt '(none)'
 Pin-Priority: -1' > rootdir/etc/apt/preferences
 
 testcandidate rapt '(none)'

-testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
-testequal 'Reading package lists...
+testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist
+testsuccessequal 'Reading package lists...

 Building dependency tree...
 Calculating upgrade...
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only
 Building dependency tree...
 Calculating upgrade...
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only


@@ -53,9 +53,9 @@ Pin: release a=unstable
 Pin-Priority: 1000' >> rootdir/etc/apt/preferences
 
 testcandidate rapt '(none)'
 Pin-Priority: 1000' >> rootdir/etc/apt/preferences
 
 testcandidate rapt '(none)'

-testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
+testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist

 
 

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

 Building dependency tree...
 Calculating upgrade...
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only
 Building dependency tree...
 Calculating upgrade...
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only