elimate duplicated code in pkgIndexFile subclasses

[apt.git] / test / integration / test-apt-get-install-deb

diff --git a/test/integration/test-apt-get-install-deb b/test/integration/test-apt-get-install-deb
index 991185dea811ee18b2b1e9bbb5bee706806e5f0b..bd720bedec688cccb13acc04f90d4126a0d5b07e 100755 (executable)
--- a/test/integration/test-apt-get-install-deb
+++ b/test/integration/test-apt-get-install-deb
@@ -22,9 +22,9 @@ E: Couldn't find any package by regex './foo.rpm'" aptget install -qq ./foo.rpm
 mv foo.rpm foo.deb
 testfailure aptget install ./foo.deb
 testsuccess grep '^E: Sub-process Popen returned an error code' rootdir/tmp/testfailure.output
-testequal 'E: Encountered a section with no Package: header
-E: Problem with MergeLister for ./foo.deb
-E: The package lists or status file could not be parsed or opened.' tail -n 3 rootdir/tmp/testfailure.output
+testequal "E: Encountered a section with no Package: header
+E: Problem with MergeList ${TMPWORKINGDIRECTORY}/foo.deb
+E: The package lists or status file could not be parsed or opened." tail -n 3 rootdir/tmp/testfailure.output
 
 # fakeroot is currently not found, framwork needs updating
 buildsimplenativepackage 'foo' 'i386,amd64' '1.0'
@@ -45,7 +45,7 @@ The following packages have unmet dependencies:
 E: Unable to correct problems, you have held broken packages." aptget install ./incoming/foo_1.0_i386.deb ./incoming/foo_1.0_amd64.deb -s -q=0
 
 testdpkgnotinstalled 'foo'
-testsuccess aptget install ./incoming/foo_1.0_i386.deb
+testsuccess aptget install ./incoming/foo_1.0_i386.deb -o Debug::pkgCacheGen=1
 testdpkginstalled 'foo'
 
 testsuccessequal "Reading package lists...
@@ -58,5 +58,5 @@ The following NEW packages will be installed:
   foo
 0 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
 Remv foo:i386 [1.0]
-Inst foo (1.0 now [amd64])
-Conf foo (1.0 now [amd64])" aptget install ./incoming/foo_1.0_amd64.deb -s -q=0
+Inst foo (1.0 local-deb [amd64])
+Conf foo (1.0 local-deb [amd64])" aptget install ./incoming/foo_1.0_amd64.deb -s -q=0