* apt-pkg/depcache.cc:

[apt.git] / test / integration / test-provides-gone-with-upgrade

diff --git a/test/integration/test-provides-gone-with-upgrade b/test/integration/test-provides-gone-with-upgrade
index ece2eaa4110fc2cc7a155c05e69b1128a4c3bcae..70384ce297dbc7209a620751af33e268ee1fb586 100755 (executable)
--- a/test/integration/test-provides-gone-with-upgrade
+++ b/test/integration/test-provides-gone-with-upgrade
@@ -13,26 +13,6 @@ Replaces: apt (<< 0.8.15)'
 
 setupaptarchive
 
 
 setupaptarchive
 

-#testequal 'Reading package lists...
-#Building dependency tree...
-#The following NEW packages will be installed:
-#  libapt-pkg4.10
-#The following packages will be upgraded:
-#  apt
-#1 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-#Inst libapt-pkg4.10 (0.8.15 unstable [i386]) [libapt-pkg4.10:i386 on apt:i386] []
-#Conf libapt-pkg4.10:i386 broken
-# Breaks:apt:i386
-# []
-#Inst apt [0.8.14] (0.8.15 unstable [i386])
-#Conf apt (0.8.15 unstable [i386])
-#E: Conf Broken libapt-pkg4.10:i386' 
-aptget dist-upgrade -s -o Debug::pkgPackageManager=1
-# the solution by dpkg will be to deconfigure apt with the configuration of libapt-pkg4.10
-
-exit 0
-
-#FIXME: a good result would be this instead, but it requires that APT can delay his immediate configuration…

 testequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
 testequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:


@@ -40,7 +20,7 @@ The following NEW packages will be installed:
 The following packages will be upgraded:
   apt
 1 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 The following packages will be upgraded:
   apt
 1 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.

+Inst apt [0.8.14] (0.8.15 unstable [i386]) []

 Inst libapt-pkg4.10 (0.8.15 unstable [i386])
 Conf libapt-pkg4.10 (0.8.15 unstable [i386])
 Inst libapt-pkg4.10 (0.8.15 unstable [i386])
 Conf libapt-pkg4.10 (0.8.15 unstable [i386])

-Inst apt [0.8.14] (0.8.15 unstable [i386])

 Conf apt (0.8.15 unstable [i386])' aptget dist-upgrade -s
 Conf apt (0.8.15 unstable [i386])' aptget dist-upgrade -s