Browse Source

Fix hidden test failure if not called via sudo

id: '': no such user
./test-bug-611729-mark-as-manual: 59: [: Illegal number:

Regression-of: 68842e1741
Gbp-Dch: Ignore
tags/debian/1.7.0_alpha1
David Kalnischkies 3 years ago
parent
commit
ea901a491b
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      test/integration/test-bug-611729-mark-as-manual
  2. +1
    -1
      test/integration/test-disappearing-packages

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

@@ -56,7 +56,7 @@ testdpkginstalled b c
testmarkedauto 'b'

sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d'
if [ -n "$SUDO_USER" -a "$(id -u "$SUDO_USER")" -gt 0 ]; then
if [ -n "$SUDO_USER" ] && [ "$(id -u "$SUDO_USER")" -gt 0 ]; then
testfileequal 'rootdir/var/log/apt/history.log' "
Requested-By: $SUDO_USER ($(id -u "$SUDO_USER"))
Reinstall: b:i386 (1.0)"


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

@@ -60,7 +60,7 @@ all files have been overwritten by other packages:
Note: This is done automatically and on purpose by dpkg.' tail -n 4 disappear.output

sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -e "s#:$(getarchitecture 'native') #:native #"
if [ -n "$SUDO_USER" -a "$(id -u "$SUDO_USER")" -gt 0 ]; then
if [ -n "$SUDO_USER" ] && [ "$(id -u "$SUDO_USER")" -gt 0 ]; then
testfileequal 'rootdir/var/log/apt/history.log' "
Requested-By: $SUDO_USER ($(id -u "$SUDO_USER"))
Install: old-pkg:native (1)


Loading…
Cancel
Save