deprecate confusing Pkg.CandVersion() method

[apt.git] / test / integration / test-apt-mark

diff --git a/test/integration/test-apt-mark b/test/integration/test-apt-mark
index 47ade45b1ea091339e8924f1af2ee21103f84cf6..7a115b03ffec11b0f5408e6aa192536ec2a3c138 100755 (executable)
--- a/test/integration/test-apt-mark
+++ b/test/integration/test-apt-mark
@@ -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 'amd64' 'i386'
 
 setupenvironment
 configarchitecture 'amd64' 'i386'
 


@@ -20,7 +20,7 @@ testdpkginstalled dpkg
 
 testnoautopkg() {
        testempty aptmark showauto
 
 testnoautopkg() {
        testempty aptmark showauto

-       testempty aptcache showauto
+       testempty aptcache -q=1 showauto

        testsuccessequal 'bar
 dpkg
 foo' aptmark showmanual
        testsuccessequal 'bar
 dpkg
 foo' aptmark showmanual


@@ -29,22 +29,22 @@ foo' aptmark showmanual bar foo uninstalled
 }
 testfooisauto() {
        testsuccessequal 'foo' aptmark showauto
 }
 testfooisauto() {
        testsuccessequal 'foo' aptmark showauto

-       testsuccessequal 'foo' aptcache showauto
+       testsuccessequal 'foo' aptcache -q=1 showauto

        testsuccessequal 'foo' aptmark showauto foo
        testsuccessequal 'foo' aptmark showauto foo

-       testsuccessequal 'foo' aptcache showauto foo
+       testsuccessequal 'foo' aptcache -q=1 showauto foo

        testsuccessequal 'bar
 dpkg' aptmark showmanual
        testsuccessequal 'bar' aptmark showmanual bar
 }
 testmarkonpkgasauto() {
        testsuccessequal 'bar
 dpkg' aptmark showmanual
        testsuccessequal 'bar' aptmark showmanual bar
 }
 testmarkonpkgasauto() {

-       testsuccess $1 $2 foo
+       testsuccess $1 -q=1 $2 foo

        testfooisauto
        testfooisauto

-       testsuccess $1 $2 foo
+       testsuccess $1 -q=1 $2 foo

        testfooisauto
 
        testfooisauto
 

-       testsuccess $1 $3 foo
+       testsuccess $1 -q=1 $3 foo

        testnoautopkg
        testnoautopkg

-       testsuccess $1 $3 foo
+       testsuccess $1 -q=1 $3 foo

        testnoautopkg
 }
 
        testnoautopkg
 }