From: Wayne Davison Date: Sat, 26 Mar 2011 18:07:20 +0000 (-0700) Subject: Verify the module list output of the daemon-via-ssh check. X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/98ec67d7860209c5cbbc848769f2ba1a7062ddef Verify the module list output of the daemon-via-ssh check. --- diff --git a/testsuite/daemon.test b/testsuite/daemon.test index 4fe94b23..013408fe 100644 --- a/testsuite/daemon.test +++ b/testsuite/daemon.test @@ -50,19 +50,22 @@ case `get_testuid` 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//' <"$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 \