summaryrefslogtreecommitdiff
path: root/test/integration/test-authentication-basic
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-11-17 22:54:29 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2014-11-18 02:41:20 +0100
commit4bb006d1ddcf1807474067dcbef9fb0bb5def0ac (patch)
treebe51ac0639d57904d8f5db8e8bcc1910f775d2da /test/integration/test-authentication-basic
parent8fe964f148344b8a55252fe52b6292a4ab86ea98 (diff)
fix file ownership tests to work on kfreebsd
While on linux files are created in /tmp with $USER:$USER, on my kfreebsd testmachine they are created with $USER:root, so we pull some strings here to make it work on both.
Diffstat (limited to 'test/integration/test-authentication-basic')
-rwxr-xr-xtest/integration/test-authentication-basic4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/test-authentication-basic b/test/integration/test-authentication-basic
index 21b024970..7e74726be 100755
--- a/test/integration/test-authentication-basic
+++ b/test/integration/test-authentication-basic
@@ -24,7 +24,7 @@ testauthfailure() {
testauthsuccess() {
testsuccess apthelper download-file "${1}/bash" ./downloaded/bash
testfileequal ./downloaded/bash "$(cat aptarchive/bash)"
- testfilestats ./downloaded/bash '%U:%G:%a' '=' "${USER}:${USER}:644"
+ testfilestats ./downloaded/bash '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:644"
rm -f ./downloaded/bash
# lets see if got/retains acceptable permissions
@@ -32,7 +32,7 @@ testauthsuccess() {
if [ "$(id -u)" = '0' ]; then
testfilestats "$AUTHCONF" '%U:%G:%a' '=' "_apt:root:600"
else
- testfilestats "$AUTHCONF" '%U:%G:%a' '=' "${USER}:${USER}:600"
+ testfilestats "$AUTHCONF" '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:600"
fi
fi