show item ID in Hit, Ign and Err lines as well

[apt.git] / test / integration / test-ubuntu-bug-1098738-apt-get-source-md5sum

diff --git a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
index 8c9c9c767dae71071d3e485056db4d3e71fed72c..48a7f0562e74c79e4a3004826aae298749289722 100755 (executable)
--- a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
+++ b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
@@ -141,13 +141,15 @@ setupaptarchive
 changetowebserver
 testsuccess aptget update
 
 changetowebserver
 testsuccess aptget update
 

+cd downloaded
+

 testok() {
        rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz
 testok() {
        rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz

-       testequal "Reading package lists...
+       testsuccessequal "Reading package lists...

 Building dependency tree...
 Need to get 6 B of source archives.
 Building dependency tree...
 Need to get 6 B of source archives.

-Get:1 http://localhost:8080/  $1 1.0 (dsc) [3 B]
-Get:2 http://localhost:8080/  $1 1.0 (tar) [3 B]
+Get:1 http://localhost:8080  $1 1.0 (dsc) [3 B]
+Get:2 http://localhost:8080  $1 1.0 (tar) [3 B]

 Download complete and in download only mode" aptget source -d "$@"
        msgtest 'Files were successfully downloaded for' "$1"
        testsuccess --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz
 Download complete and in download only mode" aptget source -d "$@"
        msgtest 'Files were successfully downloaded for' "$1"
        testsuccess --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz


@@ -157,7 +159,7 @@ Download complete and in download only mode" aptget source -d "$@"
 testkeep() {
        echo -n 'dsc' > ${1}_1.0.dsc
        echo -n 'tar' > ${1}_1.0.tar.gz
 testkeep() {
        echo -n 'dsc' > ${1}_1.0.dsc
        echo -n 'tar' > ${1}_1.0.tar.gz

-       testequal "Reading package lists...
+       testsuccessequal "Reading package lists...

 Building dependency tree...
 Skipping already downloaded file '${1}_1.0.dsc'
 Skipping already downloaded file '${1}_1.0.tar.gz'
 Building dependency tree...
 Skipping already downloaded file '${1}_1.0.dsc'
 Skipping already downloaded file '${1}_1.0.tar.gz'


@@ -170,11 +172,15 @@ Download complete and in download only mode" aptget source -d "$@"
 
 testmismatch() {
        rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz
 
 testmismatch() {
        rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz

-       testequal "Reading package lists...
+       testfailureequal "Reading package lists...

 Building dependency tree...
 Need to get 6 B of source archives.
 Building dependency tree...
 Need to get 6 B of source archives.

-Get:1 http://localhost:8080/  $1 1.0 (dsc) [3 B]
-Get:2 http://localhost:8080/  $1 1.0 (tar) [3 B]
+Get:1 http://localhost:8080  $1 1.0 (dsc) [3 B]
+Err:1 http://localhost:8080  $1 1.0 (dsc)
+  Hash Sum mismatch
+Get:2 http://localhost:8080  $1 1.0 (tar) [3 B]
+Err:2 http://localhost:8080  $1 1.0 (tar)
+  Hash Sum mismatch

 E: Failed to fetch http://localhost:8080/${1}_1.0.dsc  Hash Sum mismatch
 
 E: Failed to fetch http://localhost:8080/${1}_1.0.tar.gz  Hash Sum mismatch
 E: Failed to fetch http://localhost:8080/${1}_1.0.dsc  Hash Sum mismatch
 
 E: Failed to fetch http://localhost:8080/${1}_1.0.tar.gz  Hash Sum mismatch


@@ -184,7 +190,7 @@ E: Failed to fetch some archives." aptget source -d "$@"
        testfailure --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz
 
        rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz
        testfailure --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz
 
        rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz

-       testequal "Reading package lists...
+       testsuccessequal "Reading package lists...

 Building dependency tree...
 Skipping download of file 'pkg-sha256-bad_1.0.dsc' as requested hashsum is not available for authentication
 Skipping download of file 'pkg-sha256-bad_1.0.tar.gz' as requested hashsum is not available for authentication
 Building dependency tree...
 Skipping download of file 'pkg-sha256-bad_1.0.dsc' as requested hashsum is not available for authentication
 Skipping download of file 'pkg-sha256-bad_1.0.tar.gz' as requested hashsum is not available for authentication


@@ -194,11 +200,11 @@ Download complete and in download only mode" aptget source -d "$@" -o Acquire::F
        testfailure --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz
 
        rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz
        testfailure --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz
 
        rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz

-       testequal "Reading package lists...
+       testsuccessequal "Reading package lists...

 Building dependency tree...
 Need to get 6 B of source archives.
 Building dependency tree...
 Need to get 6 B of source archives.

-Get:1 http://localhost:8080/  $1 1.0 (dsc) [3 B]
-Get:2 http://localhost:8080/  $1 1.0 (tar) [3 B]
+Get:1 http://localhost:8080  $1 1.0 (dsc) [3 B]
+Get:2 http://localhost:8080  $1 1.0 (tar) [3 B]

 Download complete and in download only mode" aptget source --allow-unauthenticated -d "$@" -o Acquire::ForceHash=ROT26
        msgtest 'Files were downloaded unauthenticated as user allowed it' "$1"
        testsuccess --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz
 Download complete and in download only mode" aptget source --allow-unauthenticated -d "$@" -o Acquire::ForceHash=ROT26
        msgtest 'Files were downloaded unauthenticated as user allowed it' "$1"
        testsuccess --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz


@@ -219,7 +225,7 @@ testok pkg-sha256-bad -o Acquire::ForceHash=MD5Sum
 # not having MD5 sum doesn't mean the file doesn't exist at all …
 testok pkg-no-md5
 testok pkg-no-md5 -o Acquire::ForceHash=SHA256
 # not having MD5 sum doesn't mean the file doesn't exist at all …
 testok pkg-no-md5
 testok pkg-no-md5 -o Acquire::ForceHash=SHA256

-testequal "Reading package lists...
+testsuccessequal "Reading package lists...

 Building dependency tree...
 Skipping download of file 'pkg-no-md5_1.0.dsc' as requested hashsum is not available for authentication
 Skipping download of file 'pkg-no-md5_1.0.tar.gz' as requested hashsum is not available for authentication
 Building dependency tree...
 Skipping download of file 'pkg-no-md5_1.0.dsc' as requested hashsum is not available for authentication
 Skipping download of file 'pkg-no-md5_1.0.tar.gz' as requested hashsum is not available for authentication


@@ -231,21 +237,25 @@ testfailure --nomsg test -e pkg-no-md5_1.0.dsc -a -e pkg-no-md5_1.0.tar.gz
 # deal with cases in which we haven't for all files the same checksum type
 # mostly pathologic as this shouldn't happen, but just to be sure
 testok pkg-mixed-ok
 # deal with cases in which we haven't for all files the same checksum type
 # mostly pathologic as this shouldn't happen, but just to be sure
 testok pkg-mixed-ok

-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...

 Building dependency tree...
 Need to get 6 B of source archives.
 Building dependency tree...
 Need to get 6 B of source archives.

-Get:1 http://localhost:8080/  pkg-mixed-sha1-bad 1.0 (tar) [3 B]
-Get:2 http://localhost:8080/  pkg-mixed-sha1-bad 1.0 (dsc) [3 B]
+Get:1 http://localhost:8080  pkg-mixed-sha1-bad 1.0 (tar) [3 B]
+Get:2 http://localhost:8080  pkg-mixed-sha1-bad 1.0 (dsc) [3 B]
+Err:2 http://localhost:8080  pkg-mixed-sha1-bad 1.0 (dsc)
+  Hash Sum mismatch

 E: Failed to fetch http://localhost:8080/pkg-mixed-sha1-bad_1.0.dsc  Hash Sum mismatch
 
 E: Failed to fetch some archives.' aptget source -d pkg-mixed-sha1-bad
 msgtest 'Only tar file is downloaded as the dsc has hashsum mismatch' 'pkg-mixed-sha1-bad'
 testsuccess --nomsg test ! -e pkg-mixed-sha1-bad_1.0.dsc -a -e pkg-mixed-sha1-bad_1.0.tar.gz
 E: Failed to fetch http://localhost:8080/pkg-mixed-sha1-bad_1.0.dsc  Hash Sum mismatch
 
 E: Failed to fetch some archives.' aptget source -d pkg-mixed-sha1-bad
 msgtest 'Only tar file is downloaded as the dsc has hashsum mismatch' 'pkg-mixed-sha1-bad'
 testsuccess --nomsg test ! -e pkg-mixed-sha1-bad_1.0.dsc -a -e pkg-mixed-sha1-bad_1.0.tar.gz

-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...

 Building dependency tree...
 Need to get 6 B of source archives.
 Building dependency tree...
 Need to get 6 B of source archives.

-Get:1 http://localhost:8080/  pkg-mixed-sha2-bad 1.0 (tar) [3 B]
-Get:2 http://localhost:8080/  pkg-mixed-sha2-bad 1.0 (dsc) [3 B]
+Get:1 http://localhost:8080  pkg-mixed-sha2-bad 1.0 (tar) [3 B]
+Err:1 http://localhost:8080  pkg-mixed-sha2-bad 1.0 (tar)
+  Hash Sum mismatch
+Get:2 http://localhost:8080  pkg-mixed-sha2-bad 1.0 (dsc) [3 B]

 E: Failed to fetch http://localhost:8080/pkg-mixed-sha2-bad_1.0.tar.gz  Hash Sum mismatch
 
 E: Failed to fetch some archives.' aptget source -d pkg-mixed-sha2-bad
 E: Failed to fetch http://localhost:8080/pkg-mixed-sha2-bad_1.0.tar.gz  Hash Sum mismatch
 
 E: Failed to fetch some archives.' aptget source -d pkg-mixed-sha2-bad


@@ -254,9 +264,9 @@ testsuccess --nomsg test -e pkg-mixed-sha2-bad_1.0.dsc -a ! -e pkg-mixed-sha2-ba
 
 # it gets even more pathologic: multiple entries for one file, some even disagreeing!
 testok pkg-md5-agree
 
 # it gets even more pathologic: multiple entries for one file, some even disagreeing!
 testok pkg-md5-agree

-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...

 Building dependency tree...
 E: Error parsing checksum in Files of source package pkg-md5-disagree' aptget source -d pkg-md5-disagree
 Building dependency tree...
 E: Error parsing checksum in Files of source package pkg-md5-disagree' aptget source -d pkg-md5-disagree

-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...

 Building dependency tree...
 E: Error parsing checksum in Checksums-SHA256 of source package pkg-sha256-disagree' aptget source -d pkg-sha256-disagree
 Building dependency tree...
 E: Error parsing checksum in Checksums-SHA256 of source package pkg-sha256-disagree' aptget source -d pkg-sha256-disagree