fix tests run via sudo checking the history file

Git-Dch: Ignore

diff --git a/test/integration/test-apt-get-autoremove b/test/integration/test-apt-get-autoremove
index 8d4516582bb7f2d5389a166e1bb573688d34c3e1..7a28c51f18bd15bc897e9a4adf5be7f2c99bc985 100755 (executable)
--- a/test/integration/test-apt-get-autoremove
+++ b/test/integration/test-apt-get-autoremove
@@ -59,7 +59,10 @@ testsuccess aptget autoremove -y
 testdpkgnotinstalled 'po-debconf'
 testmarkedauto
 
-sed rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -e 's#), #)\nInstall: #g' | sort -u > apt-history.log
+sed rootdir/var/log/apt/history.log -e '/^Commandline: / d' \
+       -e '/^Start-Date: / d' -e '/^End-Date: / d' \
+       -e '/^Requested-By: / d' \
+       -e 's#), #)\nInstall: #g' | sort -u > apt-history.log
 testfileequal 'apt-history.log' '
 Install: debhelper:i386 (8.0.0)
 Install: po-debconf:i386 (1.0.16, automatic)

diff --git a/test/integration/test-bug-611729-mark-as-manual b/test/integration/test-bug-611729-mark-as-manual
index bd9af32b6b527a5f2d0eb1447917047719fe0262..97ef846e3e1f530555e0470d50dbfc1d71f5b8b4 100755 (executable)
--- a/test/integration/test-bug-611729-mark-as-manual
+++ b/test/integration/test-bug-611729-mark-as-manual
@@ -56,8 +56,14 @@ 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...

diff --git a/test/integration/test-disappearing-packages b/test/integration/test-disappearing-packages
index b922d2f72786ac412da49f7b2a6394910ed04ce7..177491d81e0bef51e19b9d5650887854e276ed70 100755 (executable)
--- a/test/integration/test-disappearing-packages
+++ b/test/integration/test-disappearing-packages
@@ -44,11 +44,22 @@ $CMD 2>&1 | tail -n 4 | diff -u "$COMPAREFILE" - && msgpass || msgfail
 rm "$COMPAREFILE"
 
 sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -e "s#:$(getarchitecture 'native') #:native #"
-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"))
+Install: old-pkg:native (1.0)
+
+Requested-By: $SUDO_USER ($(id -u "$SUDO_USER"))
+Install: new-pkg:native (2.0, automatic)
+Upgrade: old-pkg:native (1.0, 2.0)
+Disappeared: old-pkg (1.0)"
+else
+       testfileequal 'rootdir/var/log/apt/history.log' '
 Install: old-pkg:native (1.0)
 
 Install: new-pkg:native (2.0, automatic)
 Upgrade: old-pkg:native (1.0, 2.0)
 Disappeared: old-pkg (1.0)'
+fi
 
 testmarkedauto  # new-pkg should have get the manual flag from old-pkg