Merge branch 'debian/sid' into debian/experimental

[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..b6ee2270b2653cdf627f8599e5ef69378b021cea 100755 (executable)
--- a/test/integration/test-apt-cli-upgrade
+++ b/test/integration/test-apt-cli-upgrade
@@ -7,6 +7,13 @@ TESTDIR=$(readlink -f $(dirname $0))
 setupenvironment
 configarchitecture "i386"
 
 setupenvironment
 configarchitecture "i386"
 

+if [ ! -x ${BUILDDIRECTORY}/apt ]; then
+    msgmsg "No ${BUILDDIRECTORY}/apt"
+    msgskip 
+    exit 0
+fi
+
+

 insertpackage 'unstable' 'foo' 'all' '2.0' 'Depends: foo-new-dependency'
 insertpackage 'unstable' 'foo-new-dependency' 'all' '2.0'
 insertinstalledpackage 'foo' 'all' '1.0'
 insertpackage 'unstable' 'foo' 'all' '2.0' 'Depends: foo-new-dependency'
 insertpackage 'unstable' 'foo-new-dependency' 'all' '2.0'
 insertinstalledpackage 'foo' 'all' '1.0'


@@ -16,8 +23,7 @@ setupaptarchive
 APTARCHIVE=$(readlink -f ./aptarchive)
 
 # default is to allow new dependencies
 APTARCHIVE=$(readlink -f ./aptarchive)
 
 # default is to allow new dependencies

-testequal "Calculating upgrade... Done
-The following NEW packages will be installed:
+testequal "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


@@ -28,7 +34,6 @@ Conf foo-new-dependency (2.0 unstable [all])
 Conf foo (2.0 unstable [all])" apt upgrade -qq -s
 
 # ensure 
 Conf foo (2.0 unstable [all])" apt upgrade -qq -s
 
 # ensure 

-testequal "Calculating upgrade... Done
-The following packages have been kept back:
+testequal "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