comparison: test/bin-test/test-dav-sync-hashing.sh
test/bin-test/test-dav-sync-hashing.sh
- changeset 649
- 0f4c59ac8c74
- parent 641
- b138d1241e68
equal
deleted
inserted
replaced
| 648:fefe4b6f1048 | 649:0f4c59ac8c74 |
|---|---|
| 410 | 410 |
| 411 # do test | 411 # do test |
| 412 rm -f tmp-sync/test2a/t13file1 | 412 rm -f tmp-sync/test2a/t13file1 |
| 413 mv tmp-sync/test2a/t13file2 tmp-sync/test2a/t13file1 | 413 mv tmp-sync/test2a/t13file2 tmp-sync/test2a/t13file1 |
| 414 | 414 |
| 415 sleep 2 | |
| 415 | 416 |
| 416 dav_sync_push test2a "test 13: push failed" | 417 dav_sync_push test2a "test 13: push failed" |
| 417 # we can't check the exact output, because there are multiple valid ways | 418 # we can't check the exact output, because there are multiple valid ways |
| 418 # to sync the changes | 419 # to sync the changes |
| 419 check_tmpout "0 conflicts" "test 13: wrong conflict counter (push)" | 420 check_tmpout "0 conflicts" "test 13: wrong conflict counter (push)" |
