X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/8d041b4f4f353079268039dcbfd8b5e575196b66..6a4958d3134a3a61c036bc9ccaccc393c2bb99f2:/test/integration/test-apt-update-not-modified

diff --git a/test/integration/test-apt-update-not-modified b/test/integration/test-apt-update-not-modified
index 32818658f..b1f801bc5 100755
--- a/test/integration/test-apt-update-not-modified
+++ b/test/integration/test-apt-update-not-modified
@@ -1,13 +1,13 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 
 setupenvironment
 configarchitecture 'amd64' 'i386'
 
-insertpackage 'unstable' 'apt' 'all' '1.0'
+insertpackage 'unstable' 'apt' 'amd64,i386' '1.0'
 
 setupaptarchive --no-update
 
@@ -20,20 +20,21 @@ methodtest() {
 	listcurrentlistsdirectory > listsdir.lst
 
 	# hit again with a good cache
-	testsuccessequal "Hit $1 unstable InRelease
+	testsuccessequal "Hit:1 $1 unstable InRelease
 Reading package lists..." aptget update
 	testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
 
 	# drop an architecture, which means the file should be gone now
 	configarchitecture 'i386'
 	sed '/_binary-amd64_Packages/ d' listsdir.lst > listsdir-without-amd64.lst
-	testsuccessequal "Hit $1 unstable InRelease
+	testsuccessequal "Hit:1 $1 unstable InRelease
 Reading package lists..." aptget update
 	testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
 
 	# readd arch so its downloaded again…
 	configarchitecture 'amd64' 'i386'
 	# … but oh noes, hashsum mismatch!
+        SIZE=$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz')
 	find aptarchive/dists/unstable/main/binary-amd64/ -type f -delete
 	cat >> aptarchive/dists/unstable/main/binary-amd64/Packages <<EOF
 
@@ -42,20 +43,20 @@ Architecture: amd64
 Version: 1
 EOF
 	compressfile aptarchive/dists/unstable/main/binary-amd64/Packages
-	testfailureequal "Hit $1 unstable InRelease
-Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
-Err $1 unstable/main amd64 Packages
+	testfailureequal "Hit:1 $1 unstable InRelease
+Get:2 $1 unstable/main amd64 Packages [$SIZE B]
+Err:2 $1 unstable/main amd64 Packages
   Hash Sum mismatch
-W: Failed to fetch $1/dists/unstable/main/binary-amd64/Packages.gz  Hash Sum mismatch
-
+Reading package lists...
+E: Failed to fetch $1/dists/unstable/main/binary-amd64/Packages.gz  Hash Sum mismatch
 E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update
 	testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
 	rm -rf aptarchive/dists
 	cp -a aptarchive/dists.good aptarchive/dists
 
 	# … now everything is fine again
-	testsuccessequal "Hit $1 unstable InRelease
-Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+	testsuccessequal "Hit:1 $1 unstable InRelease
+Get:2 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
 Reading package lists..." aptget update
 	testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
 
@@ -74,24 +75,25 @@ Reading package lists..." aptget update
 	listcurrentlistsdirectory > listsdir.lst
 
 	# hit again with a good cache
-	testsuccessequal "Ign $1 unstable InRelease
+	testsuccessequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Hit $1 unstable Release
+Hit:2 $1 unstable Release
 Reading package lists..." aptget update
 	testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
 
 	# drop an architecture, which means the file should be gone now
 	configarchitecture 'i386'
 	sed '/_binary-amd64_Packages/ d' listsdir.lst > listsdir-without-amd64.lst
-	testsuccessequal "Ign $1 unstable InRelease
+	testsuccessequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Hit $1 unstable Release
+Hit:2 $1 unstable Release
 Reading package lists..." aptget update
 	testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
 
 	# readd arch so its downloaded again…
 	configarchitecture 'amd64' 'i386'
 	# … but oh noes, hashsum mismatch!
+        SIZE=$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz')
 	find aptarchive/dists/unstable/main/binary-amd64/ -type f -delete
 	cat >> aptarchive/dists/unstable/main/binary-amd64/Packages <<EOF
 
@@ -100,14 +102,14 @@ Architecture: amd64
 Version: 1
 EOF
 	compressfile aptarchive/dists/unstable/main/binary-amd64/Packages
-	testfailureequal "Ign $1 unstable InRelease
+	testfailureequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Hit $1 unstable Release
-Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
-Err $1 unstable/main amd64 Packages
+Hit:2 $1 unstable Release
+Get:4 $1 unstable/main amd64 Packages [$SIZE B]
+Err:4 $1 unstable/main amd64 Packages
   Hash Sum mismatch
-W: Failed to fetch $1/dists/unstable/main/binary-amd64/Packages.gz  Hash Sum mismatch
-
+Reading package lists...
+E: Failed to fetch $1/dists/unstable/main/binary-amd64/Packages.gz  Hash Sum mismatch
 E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update
 	testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
 	rm -rf aptarchive/dists
@@ -115,18 +117,18 @@ E: Some index files failed to download. They have been ignored, or old ones used
 	find aptarchive/dists -name 'InRelease' -delete
 
 	# … now everything is fine again
-	testsuccessequal "Ign $1 unstable InRelease
+	testsuccessequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Hit $1 unstable Release
-Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+Hit:2 $1 unstable Release
+Get:4 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
 Reading package lists..." aptget update
 	testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
 
 	webserverconfig 'aptwebserver::support::modified-since' 'false'
 	webserverconfig 'aptwebserver::support::last-modified' 'false'
-	testsuccessequal "Ign $1 unstable InRelease
+	testsuccessequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Get:1 $1 unstable Release [$(stat -c '%s' 'aptarchive/dists/unstable/Release') B]
+Get:2 $1 unstable Release [$(stat -c '%s' 'aptarchive/dists/unstable/Release') B]
 Reading package lists..." aptget update
 	webserverconfig 'aptwebserver::support::modified-since' 'true'
 	webserverconfig 'aptwebserver::support::last-modified' 'true'
@@ -155,7 +157,7 @@ Reading package lists..." aptget update
 }
 
 changetowebserver
-methodtest 'http://localhost:8080'
+methodtest "http://localhost:${APTHTTPPORT}"
 
 changetohttpswebserver
-methodtest 'https://localhost:4433'
+methodtest "https://localhost:${APTHTTPSPORT}"