test: Always install dpkg into our tests, regardless of MA

[apt.git] / test / integration / test-apt-cli-upgrade

diff --git a/test/integration/test-apt-cli-upgrade b/test/integration/test-apt-cli-upgrade
index 163a555765da55e8c13e41e62e782ed5a71f5eec..705c163866660d25c9398f6331a5c3dfe6d93ce6 100755 (executable)
--- a/test/integration/test-apt-cli-upgrade
+++ b/test/integration/test-apt-cli-upgrade
@@ -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"


@@ -13,11 +13,10 @@ insertinstalledpackage 'foo' 'all' '1.0'
 
 setupaptarchive
 
 
 setupaptarchive
 

-APTARCHIVE=$(readlink -f ./aptarchive)
+APTARCHIVE="$(readlink -f ./aptarchive)"

 
 # default is to allow new dependencies
 
 # default is to allow new dependencies

-testequal "Calculating upgrade... Done
-The following NEW packages will be installed:
+testsuccessequal "The following NEW packages will be installed:

   foo-new-dependency
 The following packages will be upgraded:
   foo
   foo-new-dependency
 The following packages will be upgraded:
   foo


@@ -27,8 +26,7 @@ Inst foo [1.0] (2.0 unstable [all])
 Conf foo-new-dependency (2.0 unstable [all])
 Conf foo (2.0 unstable [all])" apt upgrade -qq -s
 
 Conf foo-new-dependency (2.0 unstable [all])
 Conf foo (2.0 unstable [all])" apt upgrade -qq -s
 

-# ensure 
-testequal "Calculating upgrade... Done
-The following packages have been kept back:
+# ensure the 'old' way works as well
+testsuccessequal "The following packages have been kept back:

   foo
 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded." apt upgrade -qq -s --no-new-pkgs
   foo
 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded." apt upgrade -qq -s --no-new-pkgs