X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/87d6947d51717e8b0e975d913986161598a7259a..4b1fb7b1876bdb46cb7a0329158f12638baa2464:/test/integration/test-disappearing-packages diff --git a/test/integration/test-disappearing-packages b/test/integration/test-disappearing-packages index b922d2f72..177491d81 100755 --- 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