diff -r ef490647f5d1 -r 5256d7eb69e7 test/bin-test/test-dav-sync-push1.sh --- a/test/bin-test/test-dav-sync-push1.sh Wed Oct 23 20:26:53 2019 +0200 +++ b/test/bin-test/test-dav-sync-push1.sh Fri Oct 25 19:39:33 2019 +0200 @@ -34,7 +34,7 @@ fi if [ -z "$DAV_SYNC_BIN" ]; then - echo "DAV_BIN variable not set" + echo "DAV_SYNC_BIN variable not set" exit 1 fi @@ -73,7 +73,7 @@ cp synctest/file1 tmp-sync/test1a cp synctest/file2 tmp-sync/test1a -OUT=`$DAV_SYNC_BIN push test1a | tail -n 1` +OUT=`$DAV_SYNC_BIN push test1a | tail -1` TEST=`echo $OUT | grep Result` if [ $? -ne 0 ]; @@ -110,7 +110,7 @@ dav_sync_push test1a "push 2 failed" OUT=`wc -l < tmp-sync/out.txt` -if [ "$OUT" != "1" ]; +if [ $OUT -ne 1 ]; then echo "push 2: number of output lines not 1" exit 2 @@ -133,7 +133,7 @@ dav_sync_push test1a "push 4 failed" OUT=`wc -l < tmp-sync/out.txt` -if [ "$OUT" != "1" ]; +if [ $OUT -ne 1 ]; then echo "push 4: number of output lines not 1" exit 2 @@ -190,7 +190,7 @@ check_tmpout "0 conflicts" "push6: wrong conflict counter" check_tmpout "0 errors" "push6: wrong error counter" OUT=`grep mkcol tmp-sync/out.txt | wc -l` -if [ "$OUT" != "48" ]; +if [ $OUT -ne 48 ]; then echo "push 6: number of mkcol output lines not 48" exit 2 @@ -271,7 +271,7 @@ echo "push 11: dav list failed" exit 2 fi -if [ "$OUT" != "0" ]; +if [ $OUT -ne 0 ]; then echo "push 11: dav-test-repo/sync/test1/ not empty" exit 2