Browse Source

fix tests run via sudo checking the history file

Git-Dch: Ignore
tags/debian/1.2.2
David Kalnischkies 5 years ago
parent
commit
0479205d58
3 changed files with 23 additions and 3 deletions
  1. +4
    -1
      test/integration/test-apt-get-autoremove
  2. +7
    -1
      test/integration/test-bug-611729-mark-as-manual
  3. +12
    -1
      test/integration/test-disappearing-packages

+ 4
- 1
test/integration/test-apt-get-autoremove View File

@@ -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)


+ 7
- 1
test/integration/test-bug-611729-mark-as-manual View File

@@ -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...


+ 12
- 1
test/integration/test-disappearing-packages View File

@@ -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

Loading…
Cancel
Save