test: make system test users configurable

diff --git a/test/system/006-privdrop b/test/system/006-privdrop
index 6d7b0c9d3f5c155875777f66efc9b5f1887388ca..8f6e392264ab3b0f0fb933f88e8b21641c54f6f2 100755 (executable)
--- a/test/system/006-privdrop
+++ b/test/system/006-privdrop
@@ -4,7 +4,7 @@
 
 check_chronyd_features PRIVDROP || test_skip "PRIVDROP support disabled"
 
-user="nobody"
+priv_drop=1
 
 test_start "dropping of root privileges"
 

diff --git a/test/system/010-nts b/test/system/010-nts
index b215efa38df7ffd6a525ea81ff5ebbfb74da4092..d2a2184ba0e7ab02471d53e8246af7ca32f6fe7e 100755 (executable)
--- a/test/system/010-nts
+++ b/test/system/010-nts
@@ -22,7 +22,7 @@ certtool --generate-privkey --key-type=ed25519 --outfile $TEST_DIR/server.key \
        &> $TEST_DIR/certtool.log
 certtool --generate-self-signed --load-privkey $TEST_DIR/server.key \
        --template $TEST_DIR/cert.cfg --outfile $TEST_DIR/server.crt &>> $TEST_DIR/certtool.log
-chown $user $TEST_DIR/server.*
+chown "$(get_user)" $TEST_DIR/server.*
 
 ntpport=$(get_free_port)
 ntsport=$(get_free_port)

diff --git a/test/system/011-systemd b/test/system/011-systemd
index 10499661cd8e278b09649ddf96b28744c79bd805..fbd7fe9579dda91ed63b967b701cc45c847d8314 100755 (executable)
--- a/test/system/011-systemd
+++ b/test/system/011-systemd
@@ -26,7 +26,7 @@ certtool --generate-privkey --key-type=ed25519 --outfile $TEST_DIR/server.key \
        &> $TEST_DIR/certtool.log
 certtool --generate-self-signed --load-privkey $TEST_DIR/server.key \
        --template $TEST_DIR/cert.cfg --outfile $TEST_DIR/server.crt &>> $TEST_DIR/certtool.log
-chown $user $TEST_DIR/server.*
+chown "$(get_user)" $TEST_DIR/server.*
 
 ntpport=$(get_free_port)
 ntsport=$(get_free_port)

diff --git a/test/system/104-systemdirs b/test/system/104-systemdirs
index 15508dc5ca04a6ace695acf496485c7e4df8965f..420b2fb9927af25255aa05f4c433b901aed0e94e 100755 (executable)
--- a/test/system/104-systemdirs
+++ b/test/system/104-systemdirs
@@ -3,10 +3,11 @@
 TEST_LIBDIR=${CHRONY_LIBDIR:-/var/lib/chrony}
 TEST_LOGDIR=${CHRONY_LOGDIR:-/var/log/chrony}
 TEST_RUNDIR=${CHRONY_RUNDIR:-/var/run/chrony}
+TEST_PRIVDROP_USER=$(ls -ld "$TEST_RUNDIR" 2> /dev/null | awk '{print $3}')
 
 . ./test.common
 
-user=$(ls -ld "$TEST_RUNDIR" 2> /dev/null | awk '{print $3}')
+priv_drop=1
 
 test_start "system directories"
 

diff --git a/test/system/test.common b/test/system/test.common
index c389b484373d6c6ab5ff3c2b10410018bc9e56e8..79e25a831dbf2c048b72088621fef4c3fa291ba0 100644 (file)
--- a/test/system/test.common
+++ b/test/system/test.common
@@ -21,8 +21,12 @@ TEST_LIBDIR=${TEST_LIBDIR:-$TEST_DIR}
 TEST_LOGDIR=${TEST_LOGDIR:-$TEST_DIR}
 TEST_RUNDIR=${TEST_RUNDIR:-$TEST_DIR}
 TEST_SCFILTER=${TEST_SCFILTER:-0}
+TEST_ROOT_USER=${TEST_ROOT_USER:-root}
+TEST_PRIVDROP_USER=${TEST_PRIVDROP_USER:-nobody}
 
 test_start() {
+       local user=$(get_user)
+
        check_chronyd_features NTP CMDMON || test_skip "NTP/CMDMON support disabled"
 
        [ "${#TEST_DIR}" -ge 5 ] || test_skip "invalid TEST_DIR"
@@ -36,7 +40,7 @@ test_start() {
 
        rm -f "$TEST_LIBDIR"/* "$TEST_LOGDIR"/* "$TEST_RUNDIR"/*
 
-       if [ "$user" != "root" ]; then
+       if [ "$user" != "$TEST_ROOT_USER" ]; then
                id -u "$user" > /dev/null 2> /dev/null || test_skip "missing user $user"
                chown "$user:$(id -g "$user")" "$TEST_DIR" || test_skip "could not chown $TEST_DIR"
                su "$user" -s /bin/sh -c "touch $TEST_DIR/test" 2> /dev/null || \
@@ -108,7 +112,7 @@ default_clock_control=0
 default_server=127.0.0.1
 default_server_name=127.0.0.1
 default_server_options=""
-default_user=root
+default_priv_drop=0
 
 # Initialize test settings from their defaults
 for defoptname in ${!default_*}; do
@@ -183,6 +187,14 @@ get_cmdsocket() {
        echo "$TEST_RUNDIR/chronyd.sock"
 }
 
+get_user() {
+       if [ "$priv_drop" -ne 0 ]; then
+               echo "$TEST_PRIVDROP_USER"
+       else
+               echo "$TEST_ROOT_USER"
+       fi
+}
+
 # Find a free port in the 10000-20000 range (their use is racy)
 get_free_port() {
        local port
@@ -197,8 +209,9 @@ get_free_port() {
 }
 
 generate_chrony_conf() {
-       local ntpport cmdport
+       local user ntpport cmdport
 
+       user=$(get_user)
        ntpport=$(get_free_port)
        cmdport=$(get_free_port)
 
@@ -246,7 +259,7 @@ get_chronyd_options() {
        [ "$clock_control" -eq 0 ] && echo "-x"
        echo "-l $(get_logfile)"
        echo "-f $(get_conffile)"
-       echo "-u $user"
+       echo "-u $(get_user)"
        echo "-F $TEST_SCFILTER"
        echo "$extra_chronyd_options"
 }