ensure filesize of deb is included in the hashes list

[apt.git] / test / integration / test-bug-611729-mark-as-manual

diff --git a/test/integration/test-bug-611729-mark-as-manual b/test/integration/test-bug-611729-mark-as-manual
index a7bde393bcea66fc9a793d1d5565198982b96c35..97ef846e3e1f530555e0470d50dbfc1d71f5b8b4 100755 (executable)
--- a/test/integration/test-bug-611729-mark-as-manual
+++ b/test/integration/test-bug-611729-mark-as-manual
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture "i386"
 
@@ -37,14 +37,14 @@ testmarkedauto 'b'
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Reading state information...
-b is already the newest version.
+b is already the newest version (1.0).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b --only-upgrade
 testmarkedauto 'b'
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Reading state information...
-b is already the newest version.
+b is already the newest version (1.0).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b -d
 testmarkedauto 'b'
 
@@ -56,13 +56,19 @@ testdpkginstalled b c
 testmarkedauto 'b'
 
 sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d'
-testfileequal 'rootdir/var/log/apt/history.log' '
+if [ -n "$SUDO_USER" ]; then
+       testfileequal 'rootdir/var/log/apt/history.log' "
+Requested-By: $SUDO_USER ($(id -u "$SUDO_USER"))
+Reinstall: b:i386 (1.0)"
+else
+       testfileequal 'rootdir/var/log/apt/history.log' '
 Reinstall: b:i386 (1.0)'
+fi
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Reading state information...
-b is already the newest version.
+b is already the newest version (1.0).
 b set to manually installed.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b
 testmarkedauto