From 5a23c56d6852a27d45c2ae227b43060f7beac051 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 4 May 2016 11:45:35 +0200
Subject: tests: disable generation of Release.gpg by default

Most tests just need a signed repository and don't care if it signed by
an InRelease file or a Release.gpg file, so we can save some time by
just generating one of them by default.

Sounds like not much, but quickly adds up to a few seconds with the
amount of tests we have accumulated by now.

Git-Dch: Ignore
---
 test/integration/test-hashsum-verification | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'test/integration/test-hashsum-verification')

diff --git a/test/integration/test-hashsum-verification b/test/integration/test-hashsum-verification
index 31923bd87..a514b85e2 100755
--- a/test/integration/test-hashsum-verification
+++ b/test/integration/test-hashsum-verification
@@ -46,9 +46,6 @@ SHA256:
 EOF
 }
 
-# fake our downloadable file
-touch aptarchive/apt.deb
-
 PKGFILE="${TESTDIR}/$(echo "$(basename $0)" | sed 's#^test-#Packages-#')"
 
 runtest() {
@@ -63,12 +60,12 @@ runtest() {
 	msgtest 'No package from the source available'
 	testfailureequal --nomsg 'N: Unable to locate package apt
 E: No packages found' aptcache show apt
-        msgtest 'No Packages file in /var/lib/apt/lists'
-        [ "$(ls rootdir/var/lib/apt/lists/*Package* 2>/dev/null | grep -v FAILED 2>/dev/null)" = "" ] && msgpass || msgfail 
-        
+	msgtest 'No Packages file in /var/lib/apt/lists'
+	testempty find rootdir/var/lib/apt/lists -maxdepth 1 -name '*Package*'
+
         # now with the unsigned Release file
         rm -rf rootdir/var/lib/apt/lists
-        rm aptarchive/InRelease aptarchive/Release.gpg
+        rm -f aptarchive/InRelease aptarchive/Release.gpg
 	msgtest 'unsigned apt-get update gets the expected hashsum mismatch'
 	testfailure --nomsg aptget update --allow-insecure-repositories
 	testsuccess grep "Hash Sum mismatch" rootdir/tmp/testfailure.output
@@ -81,6 +78,5 @@ for COMPRESSEDINDEXES in 'false' 'true'; do
 	else
 		msgmsg 'Run tests with GzipIndexes disabled'
 	fi
- 
         runtest
 done
-- 
cgit v1.2.3