summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2018-05-16 11:46:23 +0000
committerJulian Andres Klode <jak@debian.org>2018-05-16 11:46:23 +0000
commit622439b7bd2390f709b43701f4b55a172a434b43 (patch)
tree4511447c0348a0f3d219c562c2e89dabb61cb403 /test/integration
parentb0283a5aeee428c9f2567b81ae78c9da68f6f4af (diff)
parent8cc38267809a15ec9819bce721e52fcd90a523b9 (diff)
Merge branch 'pu/gitlab-ci' into 'master'
Pu/gitlab ci See merge request apt-team/apt!17
Diffstat (limited to 'test/integration')
-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 97ef846e3..4bcd25f0f 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" ]; then
+if [ -n "$SUDO_USER" -a "$(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 e8748e6bc..b27755361 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" ]; then
+if [ -n "$SUDO_USER" -a "$(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)