X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/adc2476fa213797d849ae80fa8b5fcd9eba5dc4f..98ec67d7860209c5cbbc848769f2ba1a7062ddef:/testsuite/daemon.test

diff --git a/testsuite/daemon.test b/testsuite/daemon.test
index 2d003530..013408fe 100644
--- a/testsuite/daemon.test
+++ b/testsuite/daemon.test
@@ -42,7 +42,7 @@ cd "$scratchdir"
 ln -s test-rsyncd.conf rsyncd.conf
 
 confopt=''
-case `id -u` in
+case `get_testuid` in
 0)
     # Root needs to specify the config file, or it uses /etc/rsyncd.conf.
     echo "Forcing --config=$conf"
@@ -50,19 +50,22 @@ case `id -u` in
     ;;
 esac
 
-$RSYNC -ve "$SSH" --rsync-path="$RSYNC$confopt" localhost::
-
-RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"
-export RSYNC_CONNECT_PROG
-
-$RSYNC -v localhost:: \
-    | tee "$outfile"
 # These have a space-padded 15-char name, then a tab, then a comment.
 sed 's/NOCOMMENT//' <<EOT >"$chkfile"
 test-from      	r/o
 test-to        	r/w
 test-scratch   	NOCOMMENT
 EOT
+
+$RSYNC -ve "$SSH" --rsync-path="$RSYNC$confopt" localhost:: | tee "$outfile"
+echo '===='
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 0 failed"
+
+RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"
+export RSYNC_CONNECT_PROG
+
+$RSYNC -v localhost:: | tee "$outfile"
+echo '===='
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
 
 $RSYNC -r localhost::test-hidden \