X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/0179cfa83cf0042235eda41db7f35c420781c63e..757ec4e1ef633f9867928559df82adf3d0ac7b78:/test/integration/test-compressed-indexes

diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes
index 573a86511..ef02b45f6 100755
--- a/test/integration/test-compressed-indexes
+++ b/test/integration/test-compressed-indexes
@@ -5,7 +5,7 @@ TESTDIR="$(readlink -f "$(dirname "$0")")"
 . "$TESTDIR/framework"
 
 setupenvironment
-configcompression '.' $(aptconfig dump APT::Compressor --format '%t %v%n' | sed -n 's#^Extension \.\(.*\)$#\1#p')
+configcompression 'ALL'
 configarchitecture 'i386'
 LOWCOSTEXT='lz4'
 
@@ -33,11 +33,9 @@ testrun() {
 	msgtest 'Check if all index files are' "${1:-uncompressed}"
 	if [ "$1" = 'compressed' ]; then
 		! test -e rootdir/var/lib/apt/lists/*i386_Packages || F=1
-		! test -e rootdir/var/lib/apt/lists/*all_Packages || F=1
 		! test -e rootdir/var/lib/apt/lists/*_Sources || F=1
 		! test -e rootdir/var/lib/apt/lists/*_Translation-en || F=1
 		test -e rootdir/var/lib/apt/lists/*i386_Packages.$LOWCOSTEXT || F=1
-		test -e rootdir/var/lib/apt/lists/*all_Packages.$LOWCOSTEXT || F=1
 		test -e rootdir/var/lib/apt/lists/*_Sources.$LOWCOSTEXT || F=1
 		test -e rootdir/var/lib/apt/lists/*_Translation-en.$LOWCOSTEXT || F=1
 		# there is no point in trying pdiff if we have compressed indexes
@@ -47,11 +45,9 @@ testrun() {
 		# clear the faked pdiff indexes so the glob below works
 		rm -f rootdir/var/lib/apt/lists/*diff_Index
 		test -e rootdir/var/lib/apt/lists/*i386_Packages || F=1
-		test -e rootdir/var/lib/apt/lists/*all_Packages || F=1
 		test -e rootdir/var/lib/apt/lists/*_Sources || F=1
 		test -e rootdir/var/lib/apt/lists/*_Translation-en || F=1
 		! test -e rootdir/var/lib/apt/lists/*i386_Packages.* || F=1
-		! test -e rootdir/var/lib/apt/lists/*all_Packages.* || F=1
 		! test -e rootdir/var/lib/apt/lists/*_Sources.* || F=1
 		! test -e rootdir/var/lib/apt/lists/*_Translation-en.* || F=1
 	fi
@@ -74,7 +70,7 @@ The following NEW packages will be installed:
   testpkg
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst testpkg (1.0 unstable [i386])
-Conf testpkg (1.0 unstable [i386])' aptget install testpkg -s
+Conf testpkg (1.0 unstable [i386])' aptget install testpkg -s -o Debug::pkgAcquire::Auth=0 -o Debug::pkgAcquire::Worker=0
 	rm -f rootdir/var/cache/apt/pkgcache.bin rootdir/var/cache/apt/srcpkgcache.bin
 	testsuccessequal "$GOODSHOW" aptcache show testpkg
 	testsuccessequal "$GOODSHOW" aptcache show testpkg
@@ -96,7 +92,8 @@ Conf testpkg (1.0 unstable [i386])' aptget install testpkg -s
 " aptcache dumpavail
 }
 
-echo 'Debug::pkgAcquire::worker "true";
+echo 'Dir::Log::Planner "/dev/null";
+Debug::pkgAcquire::worker "true";
 debug::pkgAcquire::Auth "true";
 Debug::pkgAcquire::Diffs "true";
 Debug::Acquire::http "true";' > rootdir/etc/apt/apt.conf.d/99debugconf
@@ -112,6 +109,7 @@ testovermethod() {
 			INDCOMP='uncompressed'
 		else
 			INDCOMP='compressed'
+			echo 'APT::Compressor::lz4::Name "lz4";' >> rootdir/etc/apt/apt.conf.d/02compressindex
 		fi
 
 		msgmsg "${1}: ${COMPRESSOR}: Test with $INDCOMP indexes gzip=$INDEX"