comparison: test/bin-test/test-dav-sync-pull-conflict.sh
test/bin-test/test-dav-sync-pull-conflict.sh
- changeset 643
- 5b8643cf0a2f
- parent 637
- 20241338740c
- child 762
- 098b2e3ab240
equal
deleted
inserted
replaced
| 642:4e23087d3d90 | 643:5b8643cf0a2f |
|---|---|
| 280 if [ $TEST1B_COUNT_T7_1 != $TEST1B_COUNT_T7_2 ]; then | 280 if [ $TEST1B_COUNT_T7_1 != $TEST1B_COUNT_T7_2 ]; then |
| 281 echo "test 7: number of files has changed" | 281 echo "test 7: number of files has changed" |
| 282 exit 2 | 282 exit 2 |
| 283 fi | 283 fi |
| 284 | 284 |
| 285 TEST7=`dav-sync list-conflicts test1b | wc -l` | 285 TEST7=`$DAV_SYNC_BIN list-conflicts test1b | wc -l` |
| 286 if [ $TEST7 != "0" ]; then | 286 if [ $TEST7 != "0" ]; then |
| 287 echo "test 7: list-conflicts must not show conflicts" | 287 echo "test 7: list-conflicts must not show conflicts" |
| 288 return 2 | 288 return 2 |
| 289 fi | 289 fi |
| 290 | 290 |
| 333 if [ $TEST1B_COUNT_T7_1 != $TEST1B_COUNT_T7_2 ]; then | 333 if [ $TEST1B_COUNT_T7_1 != $TEST1B_COUNT_T7_2 ]; then |
| 334 echo "test 8: number of files has changed" | 334 echo "test 8: number of files has changed" |
| 335 exit 2 | 335 exit 2 |
| 336 fi | 336 fi |
| 337 | 337 |
| 338 TEST7=`dav-sync list-conflicts test1b | wc -l` | 338 TEST7=`$DAV_SYNC_BIN list-conflicts test1b | wc -l` |
| 339 if [ $TEST7 != "0" ]; then | 339 if [ $TEST7 != "0" ]; then |
| 340 echo "test 8: list-conflicts must not show conflicts" | 340 echo "test 8: list-conflicts must not show conflicts" |
| 341 return 2 | 341 return 2 |
| 342 fi | 342 fi |
| 343 | 343 |
