X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/d4c45145553781418c25343ac1478f62da645851..29c590951f812d9e9c4f17706e34f2c3315fb1f6:/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 b37ca456f..a60f0bd3a 100755
--- a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
+++ b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
@@ -217,13 +217,83 @@ Need to get 6 B of source archives.
 Get:1 http://localhost:${APTHTTPPORT}  $1 1.0 (dsc) [2 B]
 Err:1 http://localhost:${APTHTTPPORT}  $1 1.0 (dsc)
   Writing more data than expected (3 > 2)
+  Hashes of expected file:
+   - SHA256:943d3bf22ac661fb0f59bc4ff68cc12b04ff17a838dfcc2537008eb9c7f3770a
+   - Checksum-FileSize:2 [weak]
 Get:2 http://localhost:${APTHTTPPORT}  $1 1.0 (tar) [4 B]
 Err:2 http://localhost:${APTHTTPPORT}  $1 1.0 (tar)
   Hash Sum mismatch
+  Hashes of expected file:
+   - SHA256:90aebae315675cbf04612de4f7d5874850f48e0b8dd82becbeaa47ca93f5ebfb
+   - Checksum-FileSize:4 [weak]
+  Hashes of received file:
+   - SHA256:90aebae315675cbf04612de4f7d5874850f48e0b8dd82becbeaa47ca93f5ebfb
+   - Checksum-FileSize:3 [weak]
+  Last modification reported: $(lastmodification "aptarchive/${1}_1.0.dsc")
 E: Failed to fetch http://localhost:${APTHTTPPORT}/${1}_1.0.dsc  Writing more data than expected (3 > 2)
-
+   Hashes of expected file:
+    - SHA256:943d3bf22ac661fb0f59bc4ff68cc12b04ff17a838dfcc2537008eb9c7f3770a
+    - Checksum-FileSize:2 [weak]
 E: Failed to fetch http://localhost:${APTHTTPPORT}/${1}_1.0.tar.gz  Hash Sum mismatch
-
+   Hashes of expected file:
+    - SHA256:90aebae315675cbf04612de4f7d5874850f48e0b8dd82becbeaa47ca93f5ebfb
+    - Checksum-FileSize:4 [weak]
+   Hashes of received file:
+    - SHA256:90aebae315675cbf04612de4f7d5874850f48e0b8dd82becbeaa47ca93f5ebfb
+    - Checksum-FileSize:3 [weak]
+   Last modification reported: $(lastmodification "aptarchive/${1}_1.0.dsc")
+E: Failed to fetch some archives."
+	elif [ "$1" = 'pkg-md5-bad' ]; then
+		FAILURE="Reading package lists...
+Need to get 6 B of source archives.
+Get:1 http://localhost:${APTHTTPPORT}  $1 1.0 (dsc) [3 B]
+Err:1 http://localhost:${APTHTTPPORT}  $1 1.0 (dsc)
+  Hash Sum mismatch
+  Hashes of expected file:
+   - MD5Sum:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa [weak]
+   - Checksum-FileSize:3 [weak]
+  Hashes of received file:
+   - SHA512:e52b7bb395ea3f46974f1f65b7c5975839aad32d4e2ec0f458f735d5aa24d2bf36d7816ed1e01dc3c493e11879e9a8f66dfca42821608cfe993996929a6be18a
+   - SHA256:943d3bf22ac661fb0f59bc4ff68cc12b04ff17a838dfcc2537008eb9c7f3770a
+   - SHA1:324f464e6151a92cf57b26ef95dcfcf2059a8c44 [weak]
+   - MD5Sum:9604ba9427a280db542279d9ed78400b [weak]
+   - Checksum-FileSize:3 [weak]
+  Last modification reported: $(lastmodification "aptarchive/${1}_1.0.dsc")
+Get:2 http://localhost:${APTHTTPPORT}  $1 1.0 (tar) [3 B]
+Err:2 http://localhost:${APTHTTPPORT}  $1 1.0 (tar)
+  Hash Sum mismatch
+  Hashes of expected file:
+   - MD5Sum:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb [weak]
+   - Checksum-FileSize:3 [weak]
+  Hashes of received file:
+   - SHA512:5aa4cad81553320574eb72ee92bd45a1f0575528e257749dff298b2a33df9e7fc7f5c1c87fc1c8fde230f1234cca3a99bf8625a0ff7bb3238eb7e5473f9b43c0
+   - SHA256:90aebae315675cbf04612de4f7d5874850f48e0b8dd82becbeaa47ca93f5ebfb
+   - SHA1:680254bad1d7ca0d65ec46aaa315d363abf6a50a [weak]
+   - MD5Sum:db5570bf61464b46e2bde31ed61a7dc6 [weak]
+   - Checksum-FileSize:3 [weak]
+  Last modification reported: $(lastmodification "aptarchive/${1}_1.0.tar.gz")
+E: Failed to fetch http://localhost:${APTHTTPPORT}/${1}_1.0.dsc  Hash Sum mismatch
+   Hashes of expected file:
+    - MD5Sum:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa [weak]
+    - Checksum-FileSize:3 [weak]
+   Hashes of received file:
+    - SHA512:e52b7bb395ea3f46974f1f65b7c5975839aad32d4e2ec0f458f735d5aa24d2bf36d7816ed1e01dc3c493e11879e9a8f66dfca42821608cfe993996929a6be18a
+    - SHA256:943d3bf22ac661fb0f59bc4ff68cc12b04ff17a838dfcc2537008eb9c7f3770a
+    - SHA1:324f464e6151a92cf57b26ef95dcfcf2059a8c44 [weak]
+    - MD5Sum:9604ba9427a280db542279d9ed78400b [weak]
+    - Checksum-FileSize:3 [weak]
+   Last modification reported: $(lastmodification "aptarchive/${1}_1.0.dsc")
+E: Failed to fetch http://localhost:${APTHTTPPORT}/${1}_1.0.tar.gz  Hash Sum mismatch
+   Hashes of expected file:
+    - MD5Sum:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb [weak]
+    - Checksum-FileSize:3 [weak]
+   Hashes of received file:
+    - SHA512:5aa4cad81553320574eb72ee92bd45a1f0575528e257749dff298b2a33df9e7fc7f5c1c87fc1c8fde230f1234cca3a99bf8625a0ff7bb3238eb7e5473f9b43c0
+    - SHA256:90aebae315675cbf04612de4f7d5874850f48e0b8dd82becbeaa47ca93f5ebfb
+    - SHA1:680254bad1d7ca0d65ec46aaa315d363abf6a50a [weak]
+    - MD5Sum:db5570bf61464b46e2bde31ed61a7dc6 [weak]
+    - Checksum-FileSize:3 [weak]
+   Last modification reported: $(lastmodification "aptarchive/${1}_1.0.tar.gz")
 E: Failed to fetch some archives."
 	else
 		FAILURE="Reading package lists...
@@ -231,17 +301,58 @@ Need to get 6 B of source archives.
 Get:1 http://localhost:${APTHTTPPORT}  $1 1.0 (dsc) [3 B]
 Err:1 http://localhost:${APTHTTPPORT}  $1 1.0 (dsc)
   Hash Sum mismatch
+  Hashes of expected file:
+   - SHA256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+   - Checksum-FileSize:3 [weak]
+   - SHA1:324f464e6151a92cf57b26ef95dcfcf2059a8c44 [weak]
+   - MD5Sum:9604ba9427a280db542279d9ed78400b [weak]
+  Hashes of received file:
+   - SHA256:943d3bf22ac661fb0f59bc4ff68cc12b04ff17a838dfcc2537008eb9c7f3770a
+   - SHA1:324f464e6151a92cf57b26ef95dcfcf2059a8c44 [weak]
+   - MD5Sum:9604ba9427a280db542279d9ed78400b [weak]
+   - Checksum-FileSize:3 [weak]
+  Last modification reported: $(lastmodification "aptarchive/${1}_1.0.dsc")
 Get:2 http://localhost:${APTHTTPPORT}  $1 1.0 (tar) [3 B]
 Err:2 http://localhost:${APTHTTPPORT}  $1 1.0 (tar)
   Hash Sum mismatch
+  Hashes of expected file:
+   - SHA256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+   - Checksum-FileSize:3 [weak]
+   - SHA1:680254bad1d7ca0d65ec46aaa315d363abf6a50a [weak]
+   - MD5Sum:db5570bf61464b46e2bde31ed61a7dc6 [weak]
+  Hashes of received file:
+   - SHA256:90aebae315675cbf04612de4f7d5874850f48e0b8dd82becbeaa47ca93f5ebfb
+   - SHA1:680254bad1d7ca0d65ec46aaa315d363abf6a50a [weak]
+   - MD5Sum:db5570bf61464b46e2bde31ed61a7dc6 [weak]
+   - Checksum-FileSize:3 [weak]
+  Last modification reported: $(lastmodification "aptarchive/${1}_1.0.tar.gz")
 E: Failed to fetch http://localhost:${APTHTTPPORT}/${1}_1.0.dsc  Hash Sum mismatch
-
+   Hashes of expected file:
+    - SHA256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+    - Checksum-FileSize:3 [weak]
+    - SHA1:324f464e6151a92cf57b26ef95dcfcf2059a8c44 [weak]
+    - MD5Sum:9604ba9427a280db542279d9ed78400b [weak]
+   Hashes of received file:
+    - SHA256:943d3bf22ac661fb0f59bc4ff68cc12b04ff17a838dfcc2537008eb9c7f3770a
+    - SHA1:324f464e6151a92cf57b26ef95dcfcf2059a8c44 [weak]
+    - MD5Sum:9604ba9427a280db542279d9ed78400b [weak]
+    - Checksum-FileSize:3 [weak]
+   Last modification reported: $(lastmodification "aptarchive/${1}_1.0.dsc")
 E: Failed to fetch http://localhost:${APTHTTPPORT}/${1}_1.0.tar.gz  Hash Sum mismatch
-
+   Hashes of expected file:
+    - SHA256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+    - Checksum-FileSize:3 [weak]
+    - SHA1:680254bad1d7ca0d65ec46aaa315d363abf6a50a [weak]
+    - MD5Sum:db5570bf61464b46e2bde31ed61a7dc6 [weak]
+   Hashes of received file:
+    - SHA256:90aebae315675cbf04612de4f7d5874850f48e0b8dd82becbeaa47ca93f5ebfb
+    - SHA1:680254bad1d7ca0d65ec46aaa315d363abf6a50a [weak]
+    - MD5Sum:db5570bf61464b46e2bde31ed61a7dc6 [weak]
+    - Checksum-FileSize:3 [weak]
+   Last modification reported: $(lastmodification "aptarchive/${1}_1.0.tar.gz")
 E: Failed to fetch some archives."
 	fi
 	testfailureequal "$FAILURE" aptget source -d "$@"
-
 	msgtest 'Files were not download as they have hashsum mismatches for' "$1"
 	testfailure --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz
 
@@ -316,8 +427,21 @@ Need to get 3 B of source archives.
 Get:1 http://localhost:${APTHTTPPORT}  pkg-mixed-sha2-bad 1.0 (tar) [3 B]
 Err:1 http://localhost:${APTHTTPPORT}  pkg-mixed-sha2-bad 1.0 (tar)
   Hash Sum mismatch
+  Hashes of expected file:
+   - SHA256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+   - Checksum-FileSize:3 [weak]
+  Hashes of received file:
+   - SHA256:90aebae315675cbf04612de4f7d5874850f48e0b8dd82becbeaa47ca93f5ebfb
+   - Checksum-FileSize:3 [weak]
+  Last modification reported: $(lastmodification 'aptarchive/pkg-mixed-sha2-bad_1.0.tar.gz')
 E: Failed to fetch http://localhost:${APTHTTPPORT}/pkg-mixed-sha2-bad_1.0.tar.gz  Hash Sum mismatch
-
+   Hashes of expected file:
+    - SHA256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+    - Checksum-FileSize:3 [weak]
+   Hashes of received file:
+    - SHA256:90aebae315675cbf04612de4f7d5874850f48e0b8dd82becbeaa47ca93f5ebfb
+    - Checksum-FileSize:3 [weak]
+   Last modification reported: $(lastmodification 'aptarchive/pkg-mixed-sha2-bad_1.0.tar.gz')
 E: Failed to fetch some archives." aptget source -d pkg-mixed-sha2-bad
 
 # it gets even more pathologic: multiple entries for one file, some even disagreeing!