comparison: test/bin-test/test-dav-sync-push-conflict.sh
test/bin-test/test-dav-sync-push-conflict.sh
- changeset 638
- b3077bdb3d77
- parent 637
- 20241338740c
equal
deleted
inserted
replaced
| 637:20241338740c | 638:b3077bdb3d77 |
|---|---|
| 556 check_tmpout "0 conflicts" "test 15: wrong conflict counter (test1b 2)" | 556 check_tmpout "0 conflicts" "test 15: wrong conflict counter (test1b 2)" |
| 557 check_tmpout "0 errors" "test 15: wrong error counter (test1b 2)" | 557 check_tmpout "0 errors" "test 15: wrong error counter (test1b 2)" |
| 558 | 558 |
| 559 | 559 |
| 560 # ---------------------------------------------------------------------------- | 560 # ---------------------------------------------------------------------------- |
| 561 # 16. modify file in test1a/dir1/, delete dir1 in test1b | 561 # 16. test: modify file in test1a/dir1/, delete dir1 in test1b |
| 562 # expected result: many files deleted, modified file not deleted | 562 # expected result: many files deleted, modified file not deleted |
| 563 | 563 |
| 564 sleep 3 | 564 sleep 3 |
| 565 | 565 |
| 566 echo "test16_change_a" >> tmp-sync/test1a/dir1/file3 | 566 echo "test16_change_a" >> tmp-sync/test1a/dir1/file3 |
