Merge remote-tracking branch 'mvo/feature/no-more-acquire-guessing' into debian/experimental

4 files changed, 12 insertions, 38 deletions

diff --git a/test/integration/test-apt-update-filesize-mismatch b/test/integration/test-apt-update-filesize-mismatch
index b484c5161..f78b83b5f 100755
--- a/test/integration/test-apt-update-filesize-mismatch
+++ b/test/integration/test-apt-update-filesize-mismatch
@@ -38,16 +38,11 @@ for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.
 		done
 		signreleasefiles
 
-		TEST='testfailure'
-		if expr match "$COMPRESSFILE" '^.*Translation-.*$' >/dev/null; then
-			TEST='testsuccess'
-			unset COMPRESSFILE
-		fi
-		$TEST aptget update -o Debug::pkgAcquire::Worker=1
-		cp rootdir/tmp/${TEST}.output rootdir/tmp/update.output
+		testfailure aptget update -o Debug::pkgAcquire::Worker=1
+		cp rootdir/tmp/testfailure.output rootdir/tmp/update.output
 		testsuccess grep -E "$(basename -s '.gz' "$COMPRESSFILE").*Hash Sum mismatch" rootdir/tmp/update.output
-		$TEST aptcache show foo
-		$TEST aptget install foo -s
+		testfailure aptcache show foo
+		testfailure aptget install foo -s
 
 		testfailure aptcache show bar
 		testfailure aptget install bar -s
diff --git a/test/integration/test-apt-update-hashsum-mismatch b/test/integration/test-apt-update-hashsum-mismatch
index 747418c53..c2c5b3887 100755
--- a/test/integration/test-apt-update-hashsum-mismatch
+++ b/test/integration/test-apt-update-hashsum-mismatch
@@ -33,16 +33,11 @@ for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.
 	webserverconfig 'aptwebserver::overwrite' ''
 	webserverconfig "aptwebserver::overwrite::$(printf '%s' "${get}" | sed 's#/#%2F#g' )::filename" '%2FDoctorEvil.gz'
 
-	TEST='testfailure'
-	if expr match "$get" '^.*Translation-.*$' >/dev/null; then
-		TEST='testsuccess'
-		unset get
-	fi
-	$TEST aptget update
-	cp rootdir/tmp/${TEST}.output rootdir/tmp/update.output
+	testfailure aptget update
+	cp rootdir/tmp/testfailure.output rootdir/tmp/update.output
 	testsuccess grep -E "$(basename -s '.gz' "$get").*Hash Sum mismatch" rootdir/tmp/update.output
-	$TEST aptcache show foo
-	$TEST aptget install foo -s
+	testfailure aptcache show foo
+	testfailure aptget install foo -s
 
 	testfailure aptcache show bar
 	testfailure aptget install bar -s
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 fedf82c92..bca07268c 100755
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -73,16 +73,6 @@ E: Some index files failed to download. They have been ignored, or old ones used
 testoverhttp() {
 	forcecompressor "$1"
 
-	createemptyfile 'en'
-	testaptgetupdate "Get: http://localhost:8080  Packages []
-Get: http://localhost:8080  Translation-en
-Reading package lists..." "empty file en.$COMPRESS over http"
-
-	createemptyarchive 'en'
-	testaptgetupdate "Get: http://localhost:8080  Packages []
-Get: http://localhost:8080  Translation-en []
-Reading package lists..." "empty archive en.$COMPRESS over http"
-
 	createemptyarchive 'Packages'
 	testaptgetupdate "Get: http://localhost:8080  Packages []
 Reading package lists..." "empty archive Packages.$COMPRESS over http"
diff --git a/test/integration/test-bug-624218-Translation-file-handling b/test/integration/test-bug-624218-Translation-file-handling
index d3c5b08ac..d32bd513b 100755
--- a/test/integration/test-bug-624218-Translation-file-handling
+++ b/test/integration/test-bug-624218-Translation-file-handling
@@ -47,16 +47,10 @@ translationslisted() {
 translationslisted 'with full Index'
 
 
-# only compressed files available (as it happens on CD-ROM)
-sed -i '/i18n\/Translation-[^.]*$/ d' $(find aptarchive -name 'Release')
-signreleasefiles
-
-translationslisted 'with partial Index'
-
-
-# no records at all about Translation files (fallback to guessing)
-sed -i '/i18n\/Translation-.*$/ d' $(find aptarchive -name 'Release')
-signreleasefiles
+# No Release file at all, so no records about Translation files
+# (fallback to guessing)
+find aptarchive -name 'Release' -or -name 'InRelease' | xargs rm -f
+configallowinsecurerepositories "true";
 
 msgtest 'Download of en as forced language' 'without Index'
 aptget update -o Acquire::Languages=en | grep -q -e 'Translation-en ' && msgpass || msgfail