Merge remote-tracking branch 'debian/debian/experimental' into feature/acq-trans

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

diff --git a/test/integration/test-apt-get-upgrade b/test/integration/test-apt-get-upgrade
index 23446299ca8b5b2dfd394928a9a17111793746e7..5335c243aa240c1460da3ef2aafdc3ac1a9f2a02 100755 (executable)
--- a/test/integration/test-apt-get-upgrade
+++ b/test/integration/test-apt-get-upgrade
@@ -31,6 +31,7 @@ setupaptarchive
 # Test if normal upgrade works as expected
 testequal 'Reading package lists...
 Building dependency tree...
 # Test if normal upgrade works as expected
 testequal 'Reading package lists...
 Building dependency tree...

+Calculating upgrade...

 The following packages have been kept back:
   upgrade-with-conflict upgrade-with-new-dep
 The following packages will be upgraded:
 The following packages have been kept back:
   upgrade-with-conflict upgrade-with-new-dep
 The following packages will be upgraded:


@@ -42,6 +43,7 @@ Conf upgrade-simple (2.0 unstable [all])' aptget -s upgrade
 # Test if apt-get upgrade --with-new-pkgs works
 testequal 'Reading package lists...
 Building dependency tree...
 # Test if apt-get upgrade --with-new-pkgs works
 testequal 'Reading package lists...
 Building dependency tree...

+Calculating upgrade...

 The following NEW packages will be installed:
   new-dep
 The following packages have been kept back:
 The following NEW packages will be installed:
   new-dep
 The following packages have been kept back:


@@ -59,6 +61,7 @@ Conf upgrade-with-new-dep (2.0 unstable [all])' aptget -s upgrade --with-new-pkg
 # Test if apt-get dist-upgrade works
 testequal 'Reading package lists...
 Building dependency tree...
 # Test if apt-get dist-upgrade works
 testequal 'Reading package lists...
 Building dependency tree...

+Calculating upgrade...

 The following packages will be REMOVED:
   conflicting-dep
 The following NEW packages will be installed:
 The following packages will be REMOVED:
   conflicting-dep
 The following NEW packages will be installed: