comparison: test/bin-test/test-dav-sync-push-conflict.sh
test/bin-test/test-dav-sync-push-conflict.sh
- changeset 637
- 20241338740c
- parent 636
- cbd62e87b1c5
- child 638
- b3077bdb3d77
equal
deleted
inserted
replaced
| 636:cbd62e87b1c5 | 637:20241338740c |
|---|---|
| 335 | 335 |
| 336 # ---------------------------------------------------------------------------- | 336 # ---------------------------------------------------------------------------- |
| 337 # 11. test: create 3 conflicts, push, push again with -c | 337 # 11. test: create 3 conflicts, push, push again with -c |
| 338 # expected result: first push: 3 conflicts, second push: 3 files pushed | 338 # expected result: first push: 3 conflicts, second push: 3 files pushed |
| 339 | 339 |
| 340 sleep 3 | |
| 341 | |
| 340 # prepare test1a (like test 8) | 342 # prepare test1a (like test 8) |
| 341 dav_sync_pull test1a "test 11: pull failed" | 343 dav_sync_pull test1a "test 11: pull failed" |
| 342 check_tmpout "0 conflicts" "test 11: wrong conflict counter (pull test1a)" | 344 check_tmpout "0 conflicts" "test 11: wrong conflict counter (pull test1a)" |
| 343 check_tmpout "0 errors" "test 11: wrong error counter (pull test1a)" | 345 check_tmpout "0 errors" "test 11: wrong error counter (pull test1a)" |
| 344 TEST=`cat tmp-sync/out.txt | wc -l` | 346 TEST=`cat tmp-sync/out.txt | wc -l` |
| 345 if [ $TEST == "1" ]; then | 347 if [ $TEST == "1" ]; then |
| 346 echo "test 11: no files pulled" | 348 echo "test 11: no files pulled" |
| 347 exit 2 | 349 exit 2 |
| 348 fi | 350 fi |
| 351 | |
| 352 sleep 3 | |
| 349 | 353 |
| 350 # change some files in test1a and push the changes | 354 # change some files in test1a and push the changes |
| 351 echo "test11_change_a" >> tmp-sync/test1a/file1 | 355 echo "test11_change_a" >> tmp-sync/test1a/file1 |
| 352 echo "test11_change_a" >> tmp-sync/test1a/file2 | 356 echo "test11_change_a" >> tmp-sync/test1a/file2 |
| 353 echo "test11_change_a" >> tmp-sync/test1a/dir1/file1 | 357 echo "test11_change_a" >> tmp-sync/test1a/dir1/file1 |
| 430 | 434 |
| 431 # ---------------------------------------------------------------------------- | 435 # ---------------------------------------------------------------------------- |
| 432 # 13. test: 2 new, 2 mod files with conflict | 436 # 13. test: 2 new, 2 mod files with conflict |
| 433 # 2 new, 2 mod files without conflict | 437 # 2 new, 2 mod files without conflict |
| 434 # expected result: 4 conflicts, 4 files pushed | 438 # expected result: 4 conflicts, 4 files pushed |
| 439 | |
| 440 dav_sync_pull test1a "test 13: prepare test1a failed" | |
| 441 check_tmpout "0 conflicts" "test 13: wrong conflict counter (prepare test1a)" | |
| 435 | 442 |
| 436 sleep 3 | 443 sleep 3 |
| 437 | 444 |
| 438 echo "test13_change_a" >> tmp-sync/test1a/file1 | 445 echo "test13_change_a" >> tmp-sync/test1a/file1 |
| 439 echo "test13_change_a" >> tmp-sync/test1a/dir1/file4 | 446 echo "test13_change_a" >> tmp-sync/test1a/dir1/file4 |
