create "real" testcases out of the tests for chris

diff --git a/test/integration/test-conflicts-loop b/test/integration/test-conflicts-loop
index f76c016fbb41f2fecb175599d26d2151af7f67df..7b5724d74fbc1687e2d68b3bb62412869030c178 100755 (executable)
--- a/test/integration/test-conflicts-loop
+++ b/test/integration/test-conflicts-loop
@@ -15,4 +15,21 @@ insertpackage 'unstable' 'openjdk-6-jre-headless' 'i386' '6b20-1.9.8-0ubuntu1~10
 
 setupaptarchive
 
-aptget dist-upgrade -s -o Debug::pkgPackageManager=true -o Debug::pkgDpkgPM=true -o APT::Immediate-Configure-All=true
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be upgraded:
+  openjdk-6-jre openjdk-6-jre-headless openjdk-6-jre-lib
+3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+  openjdk-6-jre-lib conflicts with openjdk-6-jre
+    openjdk-6-jre conflicts with openjdk-6-jre-headless
+      openjdk-6-jre-headless conflicts with openjdk-6-jre
+Remv openjdk-6-jre [6b16-1.8-0ubuntu1]
+      openjdk-6-jre-headless conflicts with openjdk-6-jre-lib
+Remv openjdk-6-jre-lib [6b16-1.8-0ubuntu1]
+Inst openjdk-6-jre-headless [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+    openjdk-6-jre conflicts with openjdk-6-jre-lib
+Inst openjdk-6-jre [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+Inst openjdk-6-jre-lib [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+Conf openjdk-6-jre-lib (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+Conf openjdk-6-jre (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+Conf openjdk-6-jre-headless (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])' aptget dist-upgrade -s -o APT::Immediate-Configure-All=true

diff --git a/test/integration/test-package-reinstallation b/test/integration/test-package-reinstallation
index 359f6928412fcaf9430f544b1b6a34d36daed674..b4f2061ecdf9b92ea9d961e62e0df3ef5dc0cdbb 100755 (executable)
--- a/test/integration/test-package-reinstallation
+++ b/test/integration/test-package-reinstallation
@@ -14,4 +14,10 @@ insertinstalledpackage 'apt' 'i386' '0.8.15' 'Depends: libc6'
 
 setupaptarchive
 
-aptget install --reinstall libc6 libc-bin -s -o Debug::pkgPackageManager=1
+testequal 'Reading package lists...
+Building dependency tree...
+0 upgraded, 0 newly installed, 2 reinstalled, 0 to remove and 0 not upgraded.
+Inst libc-bin [2.13-8] (2.13-8 unstable [i386])
+Conf libc-bin (2.13-8 unstable [i386])
+Inst libc6 [2.13-8] (2.13-8 unstable [i386])
+Conf libc6 (2.13-8 unstable [i386])' aptget install --reinstall libc6 libc-bin -s

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
 
-#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:
@@ -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.
+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 apt [0.8.14] (0.8.15 unstable [i386])
 Conf apt (0.8.15 unstable [i386])' aptget dist-upgrade -s