comparison: test/bin-test/test-dav-sync-pull-conflict.sh
test/bin-test/test-dav-sync-pull-conflict.sh
- changeset 762
- 098b2e3ab240
- parent 643
- 5b8643cf0a2f
equal
deleted
inserted
replaced
| 761:a2f1d7c1755c | 762:098b2e3ab240 |
|---|---|
| 175 # expected result: conflict file ("/orig.0.file1") deleted | 175 # expected result: conflict file ("/orig.0.file1") deleted |
| 176 | 176 |
| 177 # don't check if the conflict file has this specific name | 177 # don't check if the conflict file has this specific name |
| 178 | 178 |
| 179 $DAV_SYNC_BIN delete-conflicts test1b > tmp-sync/out.txt | 179 $DAV_SYNC_BIN delete-conflicts test1b > tmp-sync/out.txt |
| 180 | |
| 180 if [ $? -ne 0 ]; then | 181 if [ $? -ne 0 ]; then |
| 181 echo "test 3: delete-conflicts failed" | 182 echo "test 3: delete-conflicts failed" |
| 182 exit 2 | 183 exit 2 |
| 183 fi | 184 fi |
| 184 TEST=`cat tmp-sync/out.txt | grep "1 conflict file deleted"` | 185 TEST=`cat tmp-sync/out.txt | grep "1 conflict file deleted"` |
