From 5f982b9d903b38bb5549479f0111d31e2695090c Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 25 Sep 2014 11:52:41 +0200
Subject: rewrite compressed indexes test to check with all compressors

Git-Dch: Ignore
---
 .../test-bug-595691-empty-and-broken-archive-files | 33 ++--------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

(limited to 'test/integration/test-bug-595691-empty-and-broken-archive-files')

diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files
index 23a638801..aea340203 100755
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -48,37 +48,8 @@ createemptyfile() {
 	rm -f aptarchive/Packages
 }
 
-setupcompressor() {
-	COMPRESSOR="$1"
-	COMPRESSOR_CMD="$1"
-	case $COMPRESSOR in
-	gzip) COMPRESS="gz";;
-	bzip2) COMPRESS="bz2";;
-	lzma) COMPRESS="lzma";;
-	xz) COMPRESS="xz";;
-	esac
-	echo "Acquire::CompressionTypes::Order { \"${COMPRESS}\"; };
-Dir::Bin::uncompressed \"/does/not/exist\";
-Dir::Bin::gzip \"/does/not/exist\";
-Dir::Bin::bzip2 \"/does/not/exist\";
-Dir::Bin::lzma \"/does/not/exist\";
-Dir::Bin::xz \"/does/not/exist\";" > rootdir/etc/apt/apt.conf.d/00compressor
-	if [ -e "/bin/${COMPRESSOR}" ]; then
-		echo "Dir::Bin::${COMPRESSOR} \"/bin/${COMPRESSOR}\";" >> rootdir/etc/apt/apt.conf.d/00compressor
-	elif [ -e "/usr/bin/${COMPRESSOR}" ]; then
-		echo "Dir::Bin::${COMPRESSOR} \"/usr/bin/${COMPRESSOR}\";" >> rootdir/etc/apt/apt.conf.d/00compressor
-	elif [ "${COMPRESSOR}" = 'lzma' ]; then
-		echo "Dir::Bin::xz \"/usr/bin/xz\";" >> rootdir/etc/apt/apt.conf.d/00compressor
-		COMPRESSOR_CMD='xz --format=lzma'
-	else
-		msgtest "Test for availability of compressor" "${COMPRESSOR}"
-		msgfail
-		#exit 1
-	fi
-}
-
 testoverfile() {
-	setupcompressor "$1"
+	forcecompressor "$1"
 
 	createemptyfile 'en'
 	testaptgetupdate 'Reading package lists...' "empty file en.$COMPRESS over file"
@@ -100,7 +71,7 @@ E: Some index files failed to download. They have been ignored, or old ones used
 }
 
 testoverhttp() {
-	setupcompressor "$1"
+	forcecompressor "$1"
 
 	createemptyfile 'en'
 	testaptgetupdate "Get: http://localhost:8080  Packages []
-- 
cgit v1.2.3