Thu, 29 Aug 2019 20:49:05 +0200
add push conflict tests
635
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | #!/bin/sh |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | # |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
4 | # |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | # Copyright 2019 Olaf Wintermann. All rights reserved. |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | # |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | # Redistribution and use in source and binary forms, with or without |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | # modification, are permitted provided that the following conditions are met: |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | # |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | # 1. Redistributions of source code must retain the above copyright |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | # notice, this list of conditions and the following disclaimer. |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | # |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | # 2. Redistributions in binary form must reproduce the above copyright |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | # notice, this list of conditions and the following disclaimer in the |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | # documentation and/or other materials provided with the distribution. |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | # |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | # POSSIBILITY OF SUCH DAMAGE. |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | # |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | # |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | # Test dav-sync pull conflict detection |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | # and related commands |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
33 | # |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
34 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | if [ -z "$DAV_BIN" ]; |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
36 | then |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
37 | echo "DAV_BIN variable not set" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | exit 1 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
39 | fi |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | if [ -z "$DAV_SYNC_BIN" ]; |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
41 | then |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
42 | echo "DAV_BIN variable not set" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | exit 1 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | fi |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
46 | # checks if tmp-sync/out.txt contains a specific text |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
47 | # arg1: pattern |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | # arg2: errormsg |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | check_tmpout() |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
50 | { |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
51 | TEST=`cat tmp-sync/out.txt | grep "$1"` |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
52 | if [ $? -ne 0 ]; |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
53 | then |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
54 | echo "$2" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
55 | exit 2 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
56 | fi |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | } |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
58 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
59 | # do dav-sync push and check return value |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
60 | # arg1: dir |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | # arg2: errormsg |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
62 | dav_sync_push() |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
63 | { |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
64 | $DAV_SYNC_BIN push $1 > tmp-sync/out.txt |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
65 | if [ $? -ne 0 ]; |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
66 | then |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
67 | echo "$2" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
68 | exit 2 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
69 | fi |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
70 | } |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
71 | # do dav-sync pull and check return value |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
72 | # arg1: dir |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
73 | # arg2: errormsg |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
74 | dav_sync_pull() |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
75 | { |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
76 | $DAV_SYNC_BIN pull $1 > tmp-sync/out.txt |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
77 | if [ $? -ne 0 ]; |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
78 | then |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
79 | echo "$2" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
80 | exit 2 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | fi |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | } |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
83 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
84 | rm -f .dav/dav-sync-tests-test1a-db.xml |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
85 | rm -f .dav/dav-sync-tests-test1b-db.xml |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
86 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
87 | $DAV_BIN rm dav-test-repo/sync/test1 2> /dev/null |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
88 | $DAV_BIN rm dav-test-repo/sync/test2 2> /dev/null |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
89 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
90 | $DAV_BIN mkcol dav-test-repo/sync/test1 2> /dev/null |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
91 | $DAV_BIN mkcol dav-test-repo/sync/test2 2> /dev/null |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
92 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
93 | # tmp sync dir |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
94 | rm -Rf tmp-sync |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
95 | mkdir tmp-sync |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
96 | mkdir tmp-sync/test1a |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
97 | mkdir tmp-sync/test1b |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
98 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
99 | # prepare |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
100 | cp synctest/file1 tmp-sync/test1a |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
101 | cp synctest/file2 tmp-sync/test1a |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
102 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
103 | mkdir tmp-sync/test1a/dir1/ |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
104 | mkdir tmp-sync/test1a/dir1/subdir1/ |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
105 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
106 | cp synctest/file1 tmp-sync/test1a/dir1/ |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
107 | cp synctest/file2 tmp-sync/test1a/dir1/ |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
108 | cp synctest/file3 tmp-sync/test1a/dir1/ |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
109 | cp synctest/file4 tmp-sync/test1a/dir1/ |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
110 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
111 | cp synctest/file1 tmp-sync/test1a/dir1/subdir1/ |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
112 | cp synctest/file2 tmp-sync/test1a/dir1/subdir1/ |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
113 | cp synctest/file3 tmp-sync/test1a/dir1/subdir1/ |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
114 | cp synctest/file4 tmp-sync/test1a/dir1/subdir1/ |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
115 | cp synctest/empty1 tmp-sync/test1a/dir1/subdir1/ |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
116 | cp synctest/empty2 tmp-sync/test1a/dir1/subdir1/ |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
117 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
118 | dav_sync_push test1a "prepare: push failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
119 | dav_sync_pull test1b "prepare: pull failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
120 | sleep 3 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
121 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
122 | # ---------------------------------------------------------------------------- |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
123 | # 1. test: try to push a file, that has changed on the server |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
124 | # expected result: 1 conflict |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
125 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
126 | echo "test1-mod" >> tmp-sync/test1a/file1 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
127 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
128 | dav_sync_push test1a "test 1: push test1a failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
129 | check_tmpout "1 file pushed" "test 1: wrong push counter (1)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
130 | check_tmpout "0 conflicts" "test 1: wrong conflict counter(1)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
131 | check_tmpout "0 errors" "test 1: wrong erro counter(1)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
132 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
133 | echo "test1-conflict" >> tmp-sync/test1b/file1 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
134 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
135 | dav_sync_push test1b "test 1: push test1b failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
136 | check_tmpout "0 files pushed" "test 1: wrong push counter (2)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
137 | check_tmpout "1 conflict" "test 1: wrong conflict counter(2)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
138 | check_tmpout "0 errors" "test 1: wrong erro counter(2)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
139 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
140 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
141 | # ---------------------------------------------------------------------------- |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
142 | # 2. test: try again |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
143 | # expected result: 1 conflict |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
144 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
145 | dav_sync_push test1b "test 2: push test1b failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
146 | check_tmpout "0 files pushed" "test 2: wrong push counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
147 | check_tmpout "1 conflict" "test 2: wrong conflict counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
148 | check_tmpout "0 errors" "test 2: wrong erro counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
149 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
150 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
151 | # ---------------------------------------------------------------------------- |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
152 | # 3. test: try again with -c |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
153 | # expected result: 1 file pushed, 0 conflicts |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
154 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
155 | $DAV_SYNC_BIN push -c test1b > tmp-sync/out.txt |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
156 | if [ $? -ne 0 ]; |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
157 | then |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
158 | echo "test 1: push test1b failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
159 | exit 2 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
160 | fi |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
161 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
162 | check_tmpout "1 file pushed" "test 3: wrong push counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
163 | check_tmpout "0 conflicts" "test 3: wrong conflict counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
164 | check_tmpout "0 errors" "test 3: wrong erro counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
165 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
166 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
167 | # ---------------------------------------------------------------------------- |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
168 | # 4. test: get changes in test1a and retry test 1 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
169 | # expected result: 1 conflict |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
170 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
171 | sleep 3 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
172 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
173 | dav_sync_pull test1a "test 4: pull failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
174 | check_tmpout "1 file pulled" "test 4: wrong pull counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
175 | check_tmpout "0 conflicts" "test 4: wrong conflict counter (pull)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
176 | check_tmpout "0 errors" "test 4: wrong error counter (pull)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
177 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
178 | echo "test4-mod" >> tmp-sync/test1a/file1 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
179 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
180 | dav_sync_push test1a "test 4: push test1a failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
181 | check_tmpout "1 file pushed" "test 4: wrong push counter (1)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
182 | check_tmpout "0 conflicts" "test 4: wrong conflict counter(1)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
183 | check_tmpout "0 errors" "test 4: wrong erro counter(1)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
184 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
185 | echo "test4-conflict" >> tmp-sync/test1b/file1 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
186 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
187 | dav_sync_push test1b "test 4: push test1b failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
188 | check_tmpout "0 files pushed" "test 4: wrong push counter (2)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
189 | check_tmpout "1 conflict" "test 4: wrong conflict counter(2)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
190 | check_tmpout "0 errors" "test 4: wrong erro counter(2)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
191 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
192 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
193 | # ---------------------------------------------------------------------------- |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
194 | # 5. test: check if resolve-conflicts can fix push conflicts |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
195 | # expected result: resolve-conflicts only resolves pull conflicts |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
196 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
197 | $DAV_SYNC_BIN resolve-conflicts test1b > /dev/null 2>&1 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
198 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
199 | dav_sync_push test1b "test 5: push test1b failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
200 | check_tmpout "0 files pushed" "test 5: wrong push counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
201 | check_tmpout "1 conflict" "test 5: wrong conflict counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
202 | check_tmpout "0 errors" "test 5: wrong erro counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
203 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
204 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
205 | # ---------------------------------------------------------------------------- |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
206 | # 6. test: pull (with conflict), push |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
207 | # expected result: local conflict file, 0 files pushed |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
208 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
209 | sleep 3 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
210 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
211 | dav_sync_pull test1b "test 6: pull failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
212 | check_tmpout "1 conflict" "test 6: wrong conflict counter (pull)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
213 | check_tmpout "0 errors" "test 6: wrong error counter (pull)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
214 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
215 | # check if file1 is a conflict |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
216 | $DAV_SYNC_BIN list-conflicts test1b > tmp-sync/out.txt |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
217 | check_tmpout "/file1" "test 6: list-conflicts doesn't list file1 (1)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
218 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
219 | dav_sync_push test1b "test 6: push failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
220 | check_tmpout "0 files pushed" "test 6: wrong push counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
221 | check_tmpout "0 conflicts" "test 6: wrong conflict counter (push)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
222 | check_tmpout "0 errors" "test 6: wrong error counter (push)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
223 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
224 | # check if file1 is a conflict (again) |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
225 | $DAV_SYNC_BIN list-conflicts test1b > tmp-sync/out.txt |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
226 | check_tmpout "/file1" "test 6: list-conflicts doesn't list file1 (2)" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
227 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
228 | # ---------------------------------------------------------------------------- |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
229 | # 7. test: push after resolve-conflicts |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
230 | # expected result: removes conflict from orig-file -> 1 file pushed |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
231 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
232 | $DAV_SYNC_BIN resolve-conflicts test1b > /dev/null |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
233 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
234 | TEST=`$DAV_SYNC_BIN list-conflicts test1b | wc -l` |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
235 | if [ $TEST != "0" ]; then |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
236 | echo "test 7: list-conflicts not empty" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
237 | exit 2 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
238 | fi |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
239 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
240 | dav_sync_push test1b "test 7: push failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
241 | check_tmpout "1 file pushed" "test 7: wrong push counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
242 | check_tmpout "0 conflicts" "test 7: wrong conflict counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
243 | check_tmpout "0 errors" "test 7: wrong error counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
244 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
245 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
246 | # ---------------------------------------------------------------------------- |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
247 | # 8. test: pull test1a (actually not a push test, but we need to pull test1a) |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
248 | # expected result: no conflicts |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
249 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
250 | dav_sync_pull test1a "test 8: pull failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
251 | check_tmpout "0 conflicts" "test 8: wrong conflict counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
252 | check_tmpout "0 errors" "test 8: wrong error counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
253 | TEST=`cat tmp-sync/out.txt | wc -l` |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
254 | if [ $TEST == "1" ]; then |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
255 | echo "test 8: no files pulled" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
256 | exit 2 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
257 | fi |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
258 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
259 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
260 | # ---------------------------------------------------------------------------- |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
261 | # 9. test: multiple files modified locally and on the server, push |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
262 | # expected result: multiple conflicts |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
263 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
264 | # modify 6 files in test1a |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
265 | echo "test9conflict_a" >> tmp-sync/test1a/file1 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
266 | echo "test9conflict_a" >> tmp-sync/test1a/file2 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
267 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
268 | echo "test9conflict_a" >> tmp-sync/test1a/dir1/file1 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
269 | echo "test9conflict_a" >> tmp-sync/test1a/dir1/file2 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
270 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
271 | echo "test9conflict_a" >> tmp-sync/test1a/dir1/subdir1/empty1 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
272 | echo "test9conflict_a" >> tmp-sync/test1a/dir1/subdir1/empty2 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
273 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
274 | dav_sync_push test1a "test 9: push test1a failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
275 | check_tmpout "6 files pushed" "test 9: wrong test1a push counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
276 | check_tmpout "0 conflicts" "test 9: wrong test1a conflict counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
277 | check_tmpout "0 errors" "test 9: wrong test1a error counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
278 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
279 | # modify 3 files in test1b, which are also modified in test1a |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
280 | echo "test9conflict_b" >> tmp-sync/test1b/file2 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
281 | echo "test9conflict_b" >> tmp-sync/test1b/dir1/file2 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
282 | echo "test9conflict_b" >> tmp-sync/test1b/dir1/subdir1/empty2 |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
283 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
284 | dav_sync_push test1b "test 9: push test1a failed" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
285 | check_tmpout "3 files pushed" "test 9: wrong test1b push counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
286 | check_tmpout "3 conflicts" "test 9: wrong test1b conflict counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
287 | check_tmpout "0 errors" "test 9: wrong test1b error counter" |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
288 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
289 | |
a6b1ec1b7ba0
add push conflict tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
290 |