generalize secure->insecure downgrade protection

[apt.git] / test / integration / test-bug-673536-pre-depends-breaks-loop

diff --git a/test/integration/test-bug-673536-pre-depends-breaks-loop b/test/integration/test-bug-673536-pre-depends-breaks-loop
index 21bd5e065798964acc8a562697da5c24e8d0a8a9..bf3d2e2eb864ea09a7a0bfe6e2cb090bde29fe49 100755 (executable)
--- a/test/integration/test-bug-673536-pre-depends-breaks-loop
+++ b/test/integration/test-bug-673536-pre-depends-breaks-loop
@@ -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 'native'
 
 setupenvironment
 configarchitecture 'native'
 


@@ -24,12 +24,11 @@ testloopbreak() {
        cp -a dpkg.status.backup rootdir/var/lib/dpkg/status
        rm -f rootdir/var/lib/apt/extended_states
 
        cp -a dpkg.status.backup rootdir/var/lib/dpkg/status
        rm -f rootdir/var/lib/apt/extended_states
 

-
-       testsuccess aptget install advanced=1 -y -t "$1" -o Debug::pkgPackageManager=1
+       testsuccess aptget install advanced=1 -y -t "$1"

        testdpkginstalled advanced
        testdpkgnotinstalled basic common
 
        testdpkginstalled advanced
        testdpkgnotinstalled basic common
 

-       testsuccess aptget dist-upgrade -y -t "$1" -o Debug::pkgPackageManager=1
+       testsuccess aptget dist-upgrade -y -t "$1"

        testdpkginstalled advanced basic common
 }
 
        testdpkginstalled advanced basic common
 }