diff -r cbd62e87b1c5 -r 20241338740c test/bin-test/test-dav-sync-push-conflict.sh --- a/test/bin-test/test-dav-sync-push-conflict.sh Tue Sep 03 21:24:17 2019 +0200 +++ b/test/bin-test/test-dav-sync-push-conflict.sh Wed Sep 04 19:28:10 2019 +0200 @@ -337,6 +337,8 @@ # 11. test: create 3 conflicts, push, push again with -c # expected result: first push: 3 conflicts, second push: 3 files pushed +sleep 3 + # prepare test1a (like test 8) dav_sync_pull test1a "test 11: pull failed" check_tmpout "0 conflicts" "test 11: wrong conflict counter (pull test1a)" @@ -347,6 +349,8 @@ exit 2 fi +sleep 3 + # change some files in test1a and push the changes echo "test11_change_a" >> tmp-sync/test1a/file1 echo "test11_change_a" >> tmp-sync/test1a/file2 @@ -433,6 +437,9 @@ # 2 new, 2 mod files without conflict # expected result: 4 conflicts, 4 files pushed +dav_sync_pull test1a "test 13: prepare test1a failed" +check_tmpout "0 conflicts" "test 13: wrong conflict counter (prepare test1a)" + sleep 3 echo "test13_change_a" >> tmp-sync/test1a/file1