Give our test packages proper size information

Temporary hacks should be temporary, especially if they hide bugs. After fixing one in the previous commit this is just busy work to add download information to the places which check that output. Gbp-Dch: Ignore
EricEdens · Jun 10, 2021 · 18140e1 · 18140e1
1 parent 7adecd8
commit 18140e1
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 41 deletions.
diff --git a/test/integration/Packages-releasefile-verification b/test/integration/Packages-releasefile-verification
@@ -7,9 +7,9 @@ Replaces: libapt-pkg-dev (<< 0.3.7), libapt-pkg-doc (<< 0.3.7)
 Provides: libapt-pkg-libc6.9-6-4.8
 Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
 Filename: apt.deb
-Size: 0
-MD5sum: d41d8cd98f00b204e9800998ecf8427e
-SHA256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+Size: 3
+MD5sum: 583f72a833c7dfd63c03edba3776247a
+SHA256: 5009a047a11fbd680bb40d2f23cd3fcd626ac2d672c38e16f53bd622c3961534
 Description: Advanced front-end for dpkg
  This is Debian's next generation front-end for the dpkg package manager.
  It provides the apt-get utility and APT dselect method that provides a

diff --git a/test/integration/Packages-releasefile-verification-new b/test/integration/Packages-releasefile-verification-new
@@ -10,9 +10,9 @@ Provides: libapt-pkg4.10
 Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
 Conflicts: python-apt (<< 0.7.93.2~)
 Filename: apt.deb
-Size: 0
-MD5sum: d41d8cd98f00b204e9800998ecf8427e
-SHA256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+Size: 3
+MD5sum: 583f72a833c7dfd63c03edba3776247a
+SHA256: 5009a047a11fbd680bb40d2f23cd3fcd626ac2d672c38e16f53bd622c3961534
 Description: Advanced front-end for dpkg
  This is Debian's next generation front-end for the dpkg package manager.
  It provides the apt-get utility and APT dselect method that provides a

diff --git a/test/integration/framework b/test/integration/framework
@@ -486,10 +486,6 @@ EOF
 
 	echo 'APT::Machine-ID "912e43bd1c1d4ba481f9f8ccab25f9ee";' > rootdir/etc/apt/apt.conf.d/machine-id
 
-	# XXX: We really ought to make the packages in the test suite all have Size fields.
-	# But this needs a lot more changes, so let's keep it simple for stable updates.
-	echo 'Acquire::AllowUnsizedPackages "true";' >> rootdir/etc/apt/apt.conf.d/temporary-allow-unsized-packages
-
 	configcompression '.' 'gz' #'bz2' 'lzma' 'xz'
 	confighashes 'SHA256' # these are tests, not security best-practices
 
@@ -974,14 +970,15 @@ insertpackage() {
 Priority: $PRIORITY
 Section: $SECTION
 Installed-Size: 42
+Size: 42
+SHA256: 0000000000000000000000000000000000000000000000000000000000000000
 Maintainer: Joe Sixpack <joe@example.org>"
 					test "$arch" = 'none' || echo "Architecture: $arch"
 					echo "Version: $VERSION
 Filename: pool/${DISTSECTION}/${NAME}/${NAME}_${VERSION}_${arch}.deb"
 					test -z "$DEPENDENCIES" || printf "%b\n" "$DEPENDENCIES"
 					echo "Description: $(printf '%s' "$DESCRIPTION" | head -n 1)"
 					echo "Description-md5: $(printf '%s' "$DESCRIPTION" | md5sum | cut -d' ' -f 1)"
-					echo "SHA256: 0000000000000000000000000000000000000000000000000000000000000000"
 					echo
 				} >> "${PPATH}/Packages"
 			done

diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show
@@ -36,7 +36,7 @@ Priority: optional
 Section: other
 Maintainer: Joe Sixpack <joe@example.org>
 Installed-Size: 43.0 kB
-Download-Size: unknown
+Download-Size: 42 B
 APT-Manual-Installed: yes
 APT-Sources: file:$APTARCHIVE unstable/main all Packages
 Description: Some description
@@ -48,7 +48,7 @@ Priority: optional
 Section: other
 Maintainer: Joe Sixpack <joe@example.org>
 Installed-Size: 43.0 kB
-Download-Size: unknown
+Download-Size: 42 B
 APT-Sources: file:$APTARCHIVE unstable/main i386 Packages
 Description: Some description
  That has multiple lines
@@ -59,7 +59,7 @@ Priority: optional
 Section: other
 Maintainer: Joe Sixpack <joe@example.org>
 Installed-Size: 43.0 kB
-Download-Size: unknown
+Download-Size: 42 B
 APT-Sources: file:$APTARCHIVE unstable/main amd64 Packages
 Description: Some description
  That has multiple lines
@@ -70,7 +70,7 @@ Priority: optional
 Section: other
 Maintainer: Joe Sixpack <joe@example.org>
 Installed-Size: 4229 MB
-Download-Size: unknown
+Download-Size: 42 B
 APT-Sources: file:$APTARCHIVE unstable/main amd64 Packages
 Description: Some description
  That has multiple lines
@@ -83,7 +83,7 @@ Section: other
 Maintainer: Joe Sixpack <joe@example.org>
 Installed-Size: 43.0 kB
 Provides: pkga$(generatelotsofnames)
-Download-Size: unknown
+Download-Size: 42 B
 APT-Sources: file:$APTARCHIVE unstable/main all Packages
 Description: Some description
  That has multiple lines
@@ -95,7 +95,7 @@ Section: other
 Maintainer: Joe Sixpack <joe@example.org>
 Installed-Size: 43.0 kB
 Provides: foobar, pkga$(generatelotsofnames)
-Download-Size: unknown
+Download-Size: 42 B
 APT-Sources: file:$APTARCHIVE unstable/main all Packages
 Description: Some description
  That has multiple lines
@@ -108,7 +108,7 @@ Priority: optional
 Section: other
 Maintainer: Joe Sixpack <joe@example.org>
 Installed-Size: 43.0 kB
-Download-Size: unknown
+Download-Size: 42 B
 APT-Sources: file:$APTARCHIVE unstable/main all Packages
 Description: Some description
  That has multiple lines
@@ -121,7 +121,7 @@ Priority: optional
 Section: other
 Maintainer: Joe Sixpack <joe@example.org>
 Installed-Size: 43.0 kB
-Download-Size: unknown
+Download-Size: 42 B
 APT-Sources: file:$APTARCHIVE unstable/main all Packages
 Description: Some description
  That has multiple lines
@@ -132,7 +132,7 @@ Priority: optional
 Section: other
 Maintainer: Joe Sixpack <joe@example.org>
 Installed-Size: 43.0 kB
-Download-Size: unknown
+Download-Size: 42 B
 APT-Sources: file:$APTARCHIVE unstable/main all Packages
 Description: Some description
  That has multiple lines
@@ -145,7 +145,7 @@ Priority: optional
 Section: other
 Maintainer: Joe Sixpack <joe@example.org>
 Installed-Size: 43.0 kB
-Download-Size: unknown
+Download-Size: 42 B
 APT-Sources: file:$APTARCHIVE unstable/main all Packages
 Description: Some description
  That has multiple lines
@@ -158,7 +158,7 @@ Priority: optional
 Section: other
 Maintainer: Joe Sixpack <joe@example.org>
 Installed-Size: 43.0 kB
-Download-Size: unknown
+Download-Size: 42 B
 APT-Sources: file:$APTARCHIVE unstable/main all Packages
 Description: Some description
  That has multiple lines
@@ -169,7 +169,7 @@ Priority: optional
 Section: other
 Maintainer: Joe Sixpack <joe@example.org>
 Installed-Size: 43.0 kB
-Download-Size: unknown
+Download-Size: 42 B
 APT-Sources: file:$APTARCHIVE unstable/main all Packages
 Description: Some description
  That has multiple lines

diff --git a/test/integration/test-apt-get-install-deb b/test/integration/test-apt-get-install-deb
@@ -7,9 +7,6 @@ TESTDIR="$(readlink -f "$(dirname "$0")")"
 setupenvironment
 configarchitecture 'amd64' 'i386'
 
-# XXX: Remove temporary hack
-rm rootdir/etc/apt/apt.conf.d/temporary-allow-unsized-packages
-
 # regression test for #754904
 cat > foo.rpm <<EOF
 I'm not a deb, I'm a teapot.

diff --git a/test/integration/test-bug-604222-new-and-autoremove b/test/integration/test-bug-604222-new-and-autoremove
@@ -63,6 +63,7 @@ The following additional packages will be installed:
 The following NEW packages will be installed:
   dummy-archive libavcodec52 libopenal-dev
 0 upgraded, 3 newly installed, 0 to remove and 1 not upgraded.
+Need to get 0 B/126 B of archives.
 After this operation, 129 kB of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation." aptget install dummy-archive --trivial-only
 testequal "Reading package lists...
@@ -75,6 +76,7 @@ The following additional packages will be installed:
 The following NEW packages will be installed:
   dummy-archive libavcodec52 libopenal-dev
 0 upgraded, 3 newly installed, 0 to remove and 1 not upgraded.
+Need to get 0 B/126 B of archives.
 After this operation, 129 kB of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation." aptget install dummy-archive --trivial-only -o APT::Get::HideAutoRemove=small
 
@@ -93,6 +95,7 @@ The following additional packages will be installed:
 The following NEW packages will be installed:
   dummy-archive libavcodec52 libopenal-dev
 0 upgraded, 3 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0 B/126 B of archives.
 After this operation, 129 kB of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.'
 

diff --git a/test/integration/test-bug-612557-garbage-upgrade b/test/integration/test-bug-612557-garbage-upgrade
@@ -29,6 +29,7 @@ The following NEW packages will be installed:
 The following packages will be upgraded:
   python-uno
 1 upgraded, 1 newly installed, 2 to remove and 0 not upgraded.
+Need to get 0 B/84 B of archives.
 After this operation, 53.2 MB disk space will be freed.
 E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno
 
@@ -47,6 +48,7 @@ The following NEW packages will be installed:
 The following packages will be upgraded:
   python-uno
 1 upgraded, 1 newly installed, 2 to remove and 0 not upgraded.
+Need to get 0 B/84 B of archives.
 After this operation, 53.2 MB disk space will be freed.
 E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno
 

diff --git a/test/integration/test-bug-613420-new-garbage-dependency b/test/integration/test-bug-613420-new-garbage-dependency
@@ -36,6 +36,7 @@ The following NEW packages will be installed:
 The following packages will be upgraded:
   openoffice.org-officebean
 1 upgraded, 3 newly installed, 1 to remove and 0 not upgraded.
+Need to get 0 B/168 B of archives.
 After this operation, 126 MB disk space will be freed.
 E: Trivial Only specified but this is not a trivial operation." aptget install libreoffice --trivial-only
 testequal "Reading package lists...
@@ -52,5 +53,6 @@ The following NEW packages will be installed:
 The following packages will be upgraded:
   openoffice.org-officebean
 1 upgraded, 3 newly installed, 1 to remove and 0 not upgraded.
+Need to get 0 B/168 B of archives.
 After this operation, 126 MB disk space will be freed.
 E: Trivial Only specified but this is not a trivial operation." aptget install libreoffice --trivial-only -o APT::Get::HideAutoRemove=small
diff --git a/test/integration/test-bug-64141-install-dependencies-for-on-hold b/test/integration/test-bug-64141-install-dependencies-for-on-hold
@@ -29,6 +29,7 @@ The following NEW packages will be installed:
 The following packages will be upgraded:
   apt libc6
 2 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
+Need to get 0 B/126 B of archives.
 After this operation, 0 B of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
 
@@ -42,5 +43,6 @@ The following packages have been kept back:
 The following packages will be upgraded:
   libc6
 1 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
+Need to get 0 B/42 B of archives.
 After this operation, 0 B of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only -o Test='hold-back-apt'
diff --git a/test/integration/test-bug-657695-resolver-breaks-on-virtuals b/test/integration/test-bug-657695-resolver-breaks-on-virtuals
@@ -48,5 +48,6 @@ The following packages will be REMOVED:
 The following packages will be upgraded:
   xserver-xorg-core
 1 upgraded, 0 newly installed, 50 to remove and 0 not upgraded.
+Need to get 0 B/42 B of archives.
 After this operation, 2150 kB disk space will be freed.
 E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
diff --git a/test/integration/test-bug-680041-apt-mark-holds-correctly b/test/integration/test-bug-680041-apt-mark-holds-correctly
@@ -23,6 +23,7 @@ Calculating upgrade...
 The following packages will be upgraded:
   pkgall pkgarch
 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0 B/84 B of archives.
 After this operation, 0 B of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
 
@@ -37,6 +38,7 @@ The following packages have been kept back:
 The following packages will be upgraded:
   pkgall
 1 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
+Need to get 0 B/42 B of archives.
 After this operation, 0 B of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
 
@@ -49,6 +51,7 @@ Calculating upgrade...
 The following packages will be upgraded:
   pkgall pkgarch
 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0 B/84 B of archives.
 After this operation, 0 B of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
 
@@ -63,6 +66,7 @@ The following packages have been kept back:
 The following packages will be upgraded:
   pkgarch
 1 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
+Need to get 0 B/42 B of archives.
 After this operation, 0 B of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
 

diff --git a/test/integration/test-bug-722207-print-uris-even-if-very-quiet b/test/integration/test-bug-722207-print-uris-even-if-very-quiet
@@ -17,10 +17,10 @@ setupaptarchive
 
 APTARCHIVE=$(readlink -f ./aptarchive)
 
-testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget upgrade -qq --print-uris
-testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget dist-upgrade -qq --print-uris
-testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget install apt -qq --print-uris
-testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 SHA256:0000000000000000000000000000000000000000000000000000000000000000" aptget download apt -qq --print-uris
+testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 42 " aptget upgrade -qq --print-uris
+testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 42 " aptget dist-upgrade -qq --print-uris
+testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 42 " aptget install apt -qq --print-uris
+testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 42 SHA256:0000000000000000000000000000000000000000000000000000000000000000" aptget download apt -qq --print-uris
 testsuccessequal "'file:${APTARCHIVE}/apt_2.dsc' apt_2.dsc 9 SHA256:7776436a6d741497f1cd958014e1a05b352224231428152aae39da3c17fd2fd4
 'file:${APTARCHIVE}/apt_2.tar.gz' apt_2.tar.gz 12 SHA256:f57f565eabe3fde0ec6e6e0bcc8db1d86fe2b4d6344a380a23520ddbb7728e99" aptget source apt -qq --print-uris
 testsuccessequal "'https://metadata.ftp-master.debian.org/changelogs/main/a/apt/apt_2_changelog' apt.changelog" aptget changelog apt -qq --print-uris

diff --git a/test/integration/test-explore-or-groups-in-markinstall b/test/integration/test-explore-or-groups-in-markinstall
@@ -121,7 +121,7 @@ fi
 
 if $TEST_WITH_APTITUDE; then
 	OKAYAPTITUDE='0 packages upgraded, 2 newly installed, 0 to remove and 3 not upgraded.
-Need to get 0 B of archives. After unpacking 86.0 kB will be used.
+Need to get 0 B/84 B of archives. After unpacking 86.0 kB will be used.
 Would download/install/remove packages.'
 	testsuccesstailequal 3 "$OKAYAPTITUDE" aptitude install foo-d-level2 -sy
 	testsuccesstailequal 3 "$OKAYAPTITUDE" aptitude install foo-r-level2 -sy