debian: Use debhelper to generate maint scripts

[userv.git] / tests / t-config

diff --git a/tests/t-config b/tests/t-config
index 64e2b83cd847ea315ccfce7c0e1b049ddd070021..946f7b892b302822fc1681ad9c692319e0f5060f 100755 (executable)
--- a/tests/t-config
+++ b/tests/t-config
@@ -3,41 +3,22 @@ set -ex
 
 . tests/lib
 
-(
-    cat >/etc/userv/services.d/userv-t-config <<END
-if ( glob calling-user bin
-   & glob service-user games
-   )
-       execute printenv
-fi
-END
-)
-
-tmp="${AUTOPKGTEST_ARTIFACTS}"
-if [ "x$tmp" = x ]; then
-    rm -rf tmp
-    mkdir tmp
-    tmp=tmp
-fi
-
-bin_uid=$(id -u bin)
-bin_gid=$(id -g bin)
-
-really -u bin \
-userv games userv-t-config >"$tmp"/env
-
-for expect in                                  \
-    'USERV_SERVICE=userv-t-config'             \
-    'USERV_USER=bin'                           \
-    'USERV_GROUP=bin bin'                      \
-    "USERV_UID=$bin_uid"                       \
-    "USERV_GID=$bin_gid $bin_gid"              \
-; do
-    egrep "^$expect\$" "$tmp"/env
-done
+prep_tmp
+prep_cuser
+prep_config_t_env games /etc/userv
+
+: '---------- test service invocation ----------'
+
+really -u $cuser \
+userv games userv-t-env >"$tmp"/env
+
+check_expected_env "$tmp"/env
+
+: '---------- test rejection (wrong calling user) ----------'
 
 expect_output 255 '' \
 really -u daemon \
-userv games userv-t-config
+userv games userv-t-env
+
 
 echo ok.