comparison: test/bin-test/test-dav-sync-hashing.sh
test/bin-test/test-dav-sync-hashing.sh
- changeset 639
- 928a77ebe0b9
- parent 638
- b3077bdb3d77
- child 640
- 65e40934b26c
equal
deleted
inserted
replaced
| 638:b3077bdb3d77 | 639:928a77ebe0b9 |
|---|---|
| 160 | 160 |
| 161 dav_sync_push test2a "test 4: push failed (2)" | 161 dav_sync_push test2a "test 4: push failed (2)" |
| 162 check_tmpout "1 file pushed" "test 4: wrong push counter (2)" | 162 check_tmpout "1 file pushed" "test 4: wrong push counter (2)" |
| 163 check_tmpout "0 conflicts" "test 4: wrong conflict counter (2)" | 163 check_tmpout "0 conflicts" "test 4: wrong conflict counter (2)" |
| 164 check_tmpout "0 errors" "test 4: wrong error counter (2)" | 164 check_tmpout "0 errors" "test 4: wrong error counter (2)" |
| 165 | |
| 166 | |
| 167 # ---------------------------------------------------------------------------- | |
| 168 # 5. test: set same content on both sides | |
| 169 # expected result: no conflict | |
| 170 | |
| 171 # prepare test2b | |
| 172 dav_sync_pull test2b "test 5: pull failed" | |
| 173 check_tmpout "1 file pulled" "test 5: wrong pull counter" | |
| 174 check_tmpout "0 conflicts" "test 5: wrong conflict counter (prepare)" | |
| 175 check_tmpout "0 errors" "test 5: wrong error counter (prepare)" | |
| 176 | |
| 177 # change content on both sides | |
| 178 echo "test5-change" >> tmp-sync/test2a/file1 | |
| 179 echo "test5-change" >> tmp-sync/test2b/file1 | |
| 180 | |
| 181 # push both sides | |
| 182 dav_sync_push test2a "test 5: push failed (test2a)" | |
| 183 check_tmpout "1 file pushed" "test 5: wrong push counter (test2a)" | |
| 184 check_tmpout "0 conflicts" "test 5: wrong conflict counter (test2a)" | |
| 185 check_tmpout "0 errors" "test 5: wrong error counter (test2a)" | |
| 186 | |
| 187 dav_sync_push test2b "test 5: push failed (test2b)" | |
| 188 # don't check push counter | |
| 189 check_tmpout "0 conflicts" "test 5: wrong conflict counter (test2b)" | |
| 190 check_tmpout "0 errors" "test 5: wrong error counter (test2b)" |
