summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2018-05-19 21:10:17 +0200
committerJulian Andres Klode <julian.klode@canonical.com>2018-06-25 12:06:21 +0200
commit564c2de32aad723c4572ce7fe502e91fcf563730 (patch)
tree1f0b7a9ac31425ca251f77162ffb1e04ea4ca9e9
parent74ac3094062d1c7544413b9f38acb44206e30252 (diff)
Fix hidden test failure if not called via sudo
id: '': no such user ./test-bug-611729-mark-as-manual: 59: [: Illegal number: Regression-of: 68842e1741a5005b1e3f0a07deffd737c65e3294 Gbp-Dch: Ignore (cherry picked from commit ea901a491bcfe406267c7c38c227c5caabf017a0)
-rwxr-xr-xtest/integration/test-bug-611729-mark-as-manual2
-rwxr-xr-xtest/integration/test-disappearing-packages2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/test-bug-611729-mark-as-manual b/test/integration/test-bug-611729-mark-as-manual
index 4bcd25f0f..63f8245a7 100755
--- a/test/integration/test-bug-611729-mark-as-manual
+++ b/test/integration/test-bug-611729-mark-as-manual
@@ -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)"
diff --git a/test/integration/test-disappearing-packages b/test/integration/test-disappearing-packages
index b27755361..f3fed04f3 100755
--- a/test/integration/test-disappearing-packages
+++ b/test/integration/test-disappearing-packages
@@ -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)