X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/78bc8d6b16c898c30ab046519d758ee9c1c6f42b..10e100e59a96ea7b6834a139beab5d9d70180633:/test/integration/test-compressed-indexes?ds=sidebyside

diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes
index f67077973..92e7c0e84 100755
--- a/test/integration/test-compressed-indexes
+++ b/test/integration/test-compressed-indexes
@@ -58,9 +58,11 @@ testrun() {
 		msgpass
 	fi
 	msgtest 'Check if package is downloadable'
+	cd downloaded
 	testsuccess --nomsg aptget download testpkg
 	msgtest '\tdeb file is present'; testsuccess --nomsg test -f testpkg_1.0_i386.deb
 	rm testpkg_1.0_i386.deb
+	cd - >/dev/null
 	testequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
@@ -79,17 +81,20 @@ Conf testpkg (1.0 unstable [i386])' aptget install testpkg -s
 	testequal "$GOODSHOWSRC" aptcache showsrc testpkg
 	aptget clean
 	msgtest 'Check if the source is aptgetable'
+	cd downloaded
 	testsuccess --nomsg aptget source testpkg
-	msgtest '\tdsc file is present'; testsuccess --nomsg test -f testpkg_1.0.dsc
-	msgtest '\tdirectory is present'; testsuccess --nomsg test -d testpkg-1.0
+	testsuccess test -s testpkg_1.0.dsc
+	testsuccess test -d testpkg-1.0
 	rm -rf testpkg-1.0*
+	cd - >/dev/null
 	testequal "$(aptcache show testpkg -o Acquire::Languages=none)
 " aptcache dumpavail
 }
 
 echo 'Debug::pkgAcquire::worker "true";
 debug::pkgAcquire::Auth "true";
-Debug::pkgAcquire::Diffs "true";' > rootdir/etc/apt/apt.conf.d/99debugconf
+Debug::pkgAcquire::Diffs "true";
+Debug::Acquire::http "true";' > rootdir/etc/apt/apt.conf.d/99debugconf
 
 testovermethod() {
 	forcecompressor $2
@@ -98,23 +103,28 @@ testovermethod() {
 		rm -rf rootdir/var/lib/apt/lists
 		echo "Acquire::GzipIndexes \"${INDEX}\";" > rootdir/etc/apt/apt.conf.d/02compressindex
 		local INDCOMP
-		if [ "$INDEX" = 'false' ]; then
+		if [ "$INDEX" = 'false' -o "$1" = 'cdrom' ]; then
 			INDCOMP='uncompressed'
 		else
 			INDCOMP='compressed'
 		fi
 
-		testsuccess aptget update -o Debug::Acquire::http=1
-		msgmsg "${1}: ${COMPRESSOR}: Test with $INDCOMP indexes"
+		msgmsg "${1}: ${COMPRESSOR}: Test with $INDCOMP indexes gzip=$INDEX"
+		if [ "${1}" = 'cdrom' ]; then
+			testsuccess aptcdrom add </dev/null
+		fi
+		testsuccess aptget update
 		testrun "$INDCOMP"
 
-		testsuccess aptget update -o Acquire::Pdiffs=1 -o Debug::Acquire::http=1
-		msgmsg "${1}: ${COMPRESSOR}: Test with $INDCOMP indexes (update unchanged with pdiffs)"
-		testrun "$INDCOMP"
+		if [ "${1}" != 'cdrom' ]; then
+			testsuccess aptget update -o Acquire::Pdiffs=1
+			msgmsg "${1}: ${COMPRESSOR}: Test with $INDCOMP indexes gzip=$INDEX (update unchanged with pdiffs)"
+			testrun "$INDCOMP"
 
-		testsuccess aptget update -o Acquire::Pdiffs=0 -o Debug::Acquire::http=1
-		msgmsg "${1}: ${COMPRESSOR}: Test with $INDCOMP indexes (update unchanged without pdiffs)"
-		testrun "$INDCOMP"
+			testsuccess aptget update -o Acquire::Pdiffs=0
+			msgmsg "${1}: ${COMPRESSOR}: Test with $INDCOMP indexes gzip=$INDEX (update unchanged without pdiffs)"
+			testrun "$INDCOMP"
+		fi
 
 		rm rootdir/etc/apt/apt.conf.d/02compressindex
 	done
@@ -143,3 +153,12 @@ test $(echo "$GOODPOLICY" | grep -e '^testpkg:' -e '^  Candidate:' -e '^  Instal
 testequal "$GOODPOLICY" aptcache policy testpkg
 
 for COMPRESSOR in 'gzip' 'bzip2' 'lzma' 'xz'; do testovermethod 'http' $COMPRESSOR; done
+
+changetocdrom 'Debian APT Testdisk 0.8.15'
+rm -rf rootdir/var/lib/apt/lists
+testsuccess aptcdrom add </dev/null
+GOODPOLICY="$(aptcache policy testpkg)"
+test $(echo "$GOODPOLICY" | grep -e '^testpkg:' -e '^  Candidate:' -e '^  Installed: (none)' -e '500 cdrom://' | wc -l) -eq 4 || msgdie 'policy is broken'
+testequal "$GOODPOLICY" aptcache policy testpkg
+
+for COMPRESSOR in 'gzip' 'bzip2' 'lzma' 'xz'; do testovermethod 'cdrom' $COMPRESSOR; done