Sun, 25 Aug 2019 09:43:12 +0200
rename conflict test script
632
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | #!/bin/sh |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | # |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
4 | # |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | # Copyright 2019 Olaf Wintermann. All rights reserved. |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | # |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | # Redistribution and use in source and binary forms, with or without |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | # modification, are permitted provided that the following conditions are met: |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | # |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | # 1. Redistributions of source code must retain the above copyright |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | # notice, this list of conditions and the following disclaimer. |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | # |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | # 2. Redistributions in binary form must reproduce the above copyright |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | # notice, this list of conditions and the following disclaimer in the |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | # documentation and/or other materials provided with the distribution. |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | # |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
2e1b59290829
rename conflict test script
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 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | # POSSIBILITY OF SUCH DAMAGE. |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | # |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | # |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | # Test dav-sync pull conflict detection |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | # and related commands |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
33 | # |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
34 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | if [ -z "$DAV_BIN" ]; |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
36 | then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
37 | echo "DAV_BIN variable not set" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | exit 1 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
39 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | if [ -z "$DAV_SYNC_BIN" ]; |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
41 | then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
42 | echo "DAV_BIN variable not set" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | exit 1 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
46 | # checks if tmp-sync/out.txt contains a specific text |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
47 | # arg1: pattern |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | # arg2: errormsg |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | check_tmpout() |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
50 | { |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
51 | TEST=`cat tmp-sync/out.txt | grep "$1"` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
52 | if [ $? -ne 0 ]; |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
53 | then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
54 | echo "$2" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
55 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
56 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | } |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
58 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
59 | # do dav-sync push and check return value |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
60 | # arg1: dir |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | # arg2: errormsg |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
62 | dav_sync_push() |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
63 | { |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
64 | $DAV_SYNC_BIN push $1 > tmp-sync/out.txt |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
65 | if [ $? -ne 0 ]; |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
66 | then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
67 | echo "$2" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
68 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
69 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
70 | } |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
71 | # do dav-sync pull and check return value |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
72 | # arg1: dir |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
73 | # arg2: errormsg |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
74 | dav_sync_pull() |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
75 | { |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
76 | $DAV_SYNC_BIN pull $1 > tmp-sync/out.txt |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
77 | if [ $? -ne 0 ]; |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
78 | then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
79 | echo "$2" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
80 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | } |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
83 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
84 | rm -f .dav/dav-sync-tests-test1a-db.xml |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
85 | rm -f .dav/dav-sync-tests-test1b-db.xml |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
86 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
87 | $DAV_BIN rm dav-test-repo/sync/test1 2> /dev/null |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
88 | $DAV_BIN rm dav-test-repo/sync/test2 2> /dev/null |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
89 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
90 | $DAV_BIN mkcol dav-test-repo/sync/test1 2> /dev/null |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
91 | $DAV_BIN mkcol dav-test-repo/sync/test2 2> /dev/null |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
92 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
93 | # prepare |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
94 | cp synctest/file1 tmp-sync/test1a |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
95 | cp synctest/file2 tmp-sync/test1a |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
96 | dav_sync_push test1a "prepare: push failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
97 | dav_sync_pull test1b "prepare: pull failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
98 | sleep 3 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
99 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
100 | # ---------------------------------------------------------------------------- |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
101 | # 1. test: pull, local file also modified |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
102 | # expected result: 1 conflict |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
103 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
104 | echo "conflict1-test1" >> tmp-sync/test1a/file1 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
105 | dav_sync_push test1a "prepare: push failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
106 | check_tmpout "1 file pushed" "test 1: wrong push counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
107 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
108 | TEST1B_COUNT1=`ls tmp-sync/test1b/ | wc -l` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
109 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
110 | echo "conflict1-test1-conflict" >> tmp-sync/test1b/file1 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
111 | dav_sync_pull test1b "prepare: pull failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
112 | check_tmpout "1 file pulled" "test 1: wrong pull counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
113 | check_tmpout "1 conflict" "test 1: wrong conflict counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
114 | check_tmpout "0 errors" "test 1: wrong error counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
115 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
116 | TEST1B_COUNT2=`ls tmp-sync/test1b/ | wc -l` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
117 | # check if the conflict file was moved |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
118 | if [ $TEST1B_COUNT1 = $TEST1B_COUNT2 ]; then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
119 | echo "test 1: conflict file not renamed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
120 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
121 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
122 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
123 | # warning: never check if the moved conflict file has a specific |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
124 | # name like "orig.0.file1" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
125 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
126 | # ---------------------------------------------------------------------------- |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
127 | # 2. test: check list-conflicts command |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
128 | # expected result: "/file1" output |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
129 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
130 | $DAV_SYNC_BIN list-conflicts test1b > tmp-sync/out.txt |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
131 | if [ $? -ne 0 ]; then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
132 | echo "test 2: list-conflicts failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
133 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
134 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
135 | TEST=`cat tmp-sync/out.txt | grep "/file1"` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
136 | if [ $? -ne 0 ]; |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
137 | then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
138 | echo "test 2: wrong list-conflicts output" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
139 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
140 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
141 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
142 | # ---------------------------------------------------------------------------- |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
143 | # 3. test: check delete-conflicts command |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
144 | # expected result: conflict file ("/orig.0.file1") deleted |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
145 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
146 | # don't check if the conflict file has this specific name |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
147 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
148 | $DAV_SYNC_BIN delete-conflicts test1b > tmp-sync/out.txt |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
149 | if [ $? -ne 0 ]; then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
150 | echo "test 3: delete-conflicts failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
151 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
152 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
153 | TEST=`cat tmp-sync/out.txt | grep "1 conflict file deleted"` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
154 | if [ $? -ne 0 ]; |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
155 | then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
156 | echo "test 3: wrong delete-conflicts output" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
157 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
158 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
159 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
160 | TEST1B_COUNT3=`ls tmp-sync/test1b/ | wc -l` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
161 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
162 | if [ $TEST1B_COUNT1 != $TEST1B_COUNT3 ]; then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
163 | echo "test 3: file not removed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
164 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
165 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
166 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
167 | # ---------------------------------------------------------------------------- |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
168 | # 4. test: pull after deleted conflicts |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
169 | # expected result: 0 files pulled, 0 conflicts |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
170 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
171 | dav_sync_pull test1b "test 4: pull failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
172 | check_tmpout "0 files pulled" "test 4: wrong pull counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
173 | check_tmpout "0 conflicts" "test 4: wrong conflict counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
174 | check_tmpout "0 errors" "test 4: wrong error counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
175 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
176 | # ---------------------------------------------------------------------------- |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
177 | # 5. test: pull, local file also modified, delete-conflicts |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
178 | # this test prepares test 6, to test 'push' after 'delete-conflicts' |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
179 | # expected result: 0 files pulled, 0 conflicts |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
180 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
181 | sleep 3 # make sure mtime changes |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
182 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
183 | echo "conflict1-test5" >> tmp-sync/test1a/file1 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
184 | dav_sync_push test1a "prepare: push failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
185 | check_tmpout "1 file pushed" "test 1: wrong push counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
186 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
187 | echo "conflict1-test5-conflict" >> tmp-sync/test1b/file1 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
188 | dav_sync_pull test1b "prepare: pull failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
189 | check_tmpout "1 file pulled" "test 1: wrong pull counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
190 | check_tmpout "1 conflict" "test 1: wrong conflict counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
191 | check_tmpout "0 errors" "test 1: wrong error counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
192 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
193 | $DAV_SYNC_BIN delete-conflicts test1b > tmp-sync/out.txt |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
194 | if [ $? -ne 0 ]; then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
195 | echo "test 3: delete-conflicts failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
196 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
197 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
198 | TEST=`cat tmp-sync/out.txt | grep "1 conflict file deleted"` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
199 | if [ $? -ne 0 ]; |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
200 | then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
201 | echo "test 3: wrong delete-conflicts output" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
202 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
203 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
204 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
205 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
206 | # ---------------------------------------------------------------------------- |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
207 | # 6. test: push after deleted conflicts |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
208 | # expected result: 0 files pushed, 0 conflicts |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
209 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
210 | dav_sync_push test1b "test 6: push failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
211 | check_tmpout "0 files pushed" "test 6: wrong push counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
212 | check_tmpout "0 conflicts" "test 6: wrong conflict counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
213 | check_tmpout "0 errors" "test 6: wrong error counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
214 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
215 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
216 | # ---------------------------------------------------------------------------- |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
217 | # 7. test: resolve-conflicts after pull, followed by push |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
218 | # expected result: pull with 1 conflict, resolve-conflicts removes conflicts |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
219 | # from db (list-conflicts doesn't show conflicts after that) |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
220 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
221 | sleep 3 # make sure mtime changes |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
222 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
223 | echo "conflict1-test7" >> tmp-sync/test1a/file1 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
224 | dav_sync_push test1a "prepare: push failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
225 | check_tmpout "1 file pushed" "test 7: wrong push counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
226 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
227 | echo "conflict1-test7-conflict" >> tmp-sync/test1b/file1 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
228 | dav_sync_pull test1b "prepare: pull failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
229 | check_tmpout "1 file pulled" "test 7: wrong pull counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
230 | check_tmpout "1 conflict" "test 7: wrong conflict counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
231 | check_tmpout "0 errors" "test 7: wrong error counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
232 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
233 | TEST1B_COUNT_T7_1=`ls tmp-sync/test1b/ | wc -l` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
234 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
235 | $DAV_SYNC_BIN resolve-conflicts test1b > tmp-sync/out.txt |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
236 | if [ $? -ne 0 ]; then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
237 | echo "test 7: resolve-conflicts failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
238 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
239 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
240 | TEST=`cat tmp-sync/out.txt | grep "1 conflict resolved"` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
241 | if [ $? -ne 0 ]; |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
242 | then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
243 | echo "test 7: wrong resolve-conflicts output" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
244 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
245 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
246 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
247 | TEST1B_COUNT_T7_2=`ls tmp-sync/test1b/ | wc -l` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
248 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
249 | if [ $TEST1B_COUNT_T7_1 != $TEST1B_COUNT_T7_2 ]; then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
250 | echo "test 7: number of files has changed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
251 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
252 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
253 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
254 | TEST7=`dav-sync list-conflicts test1b | wc -l` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
255 | if [ $TEST7 != "0" ]; then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
256 | echo "test 7: list-conflicts must not show conflicts" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
257 | return 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
258 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
259 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
260 | # pull again, should do nothing |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
261 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
262 | dav_sync_pull test1b "test 7: pull(2) failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
263 | check_tmpout "0 files pulled" "test 7: wrong pull counter (2)" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
264 | check_tmpout "0 conflicts" "test 7: wrong conflict counter (2)" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
265 | check_tmpout "0 errors" "test 7: wrong error counter (2)" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
266 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
267 | # ---------------------------------------------------------------------------- |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
268 | # 8. test: resolve-conflicts after pull, followed by push |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
269 | # expected result: pull with 1 conflict, resolve-conflicts removes conflicts |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
270 | # from db (list-conflicts doesn't show conflicts after that) |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
271 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
272 | # test mostly the same as test 7 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
273 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
274 | sleep 3 # make sure mtime changes |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
275 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
276 | echo "conflict1-test8" >> tmp-sync/test1a/file1 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
277 | dav_sync_push test1a "prepare: push failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
278 | check_tmpout "1 file pushed" "test 8: wrong push counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
279 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
280 | echo "conflict1-test8-conflict" >> tmp-sync/test1b/file1 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
281 | dav_sync_pull test1b "prepare: pull failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
282 | check_tmpout "1 file pulled" "test 8: wrong pull counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
283 | check_tmpout "1 conflict" "test 8: wrong conflict counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
284 | check_tmpout "0 errors" "test 8: wrong error counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
285 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
286 | TEST1B_COUNT_T7_1=`ls tmp-sync/test1b/ | wc -l` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
287 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
288 | $DAV_SYNC_BIN resolve-conflicts test1b > tmp-sync/out.txt |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
289 | if [ $? -ne 0 ]; then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
290 | echo "test 8: resolve-conflicts failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
291 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
292 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
293 | TEST=`cat tmp-sync/out.txt | grep "1 conflict resolved"` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
294 | if [ $? -ne 0 ]; |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
295 | then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
296 | echo "test 8: wrong resolve-conflicts output" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
297 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
298 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
299 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
300 | TEST1B_COUNT_T7_2=`ls tmp-sync/test1b/ | wc -l` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
301 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
302 | if [ $TEST1B_COUNT_T7_1 != $TEST1B_COUNT_T7_2 ]; then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
303 | echo "test 8: number of files has changed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
304 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
305 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
306 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
307 | TEST7=`dav-sync list-conflicts test1b | wc -l` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
308 | if [ $TEST7 != "0" ]; then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
309 | echo "test 8: list-conflicts must not show conflicts" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
310 | return 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
311 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
312 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
313 | # push, 2 resolved conflict files (test 7 and test 8 'orig' file) |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
314 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
315 | dav_sync_push test1b "test 8: push failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
316 | check_tmpout "2 files pushed" "test 8: wrong push counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
317 | check_tmpout "0 conflicts" "test 8: wrong conflicts counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
318 | check_tmpout "0 errors" "test 8: wrong error counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
319 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
320 | # push again, shoud do nothing |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
321 | dav_sync_push test1b "test 8: push(2) failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
322 | check_tmpout "0 files pushed" "test 8: wrong push counter (2)" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
323 | check_tmpout "0 conflicts" "test 8: wrong conflicts counter (2)" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
324 | check_tmpout "0 errors" "test 8: wrong error counter (2)" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
325 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
326 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
327 | # ---------------------------------------------------------------------------- |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
328 | # 9. test: test1a deleted file, test1b modified file |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
329 | # expected result: conflict |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
330 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
331 | sleep 3 # make sure mtime changes |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
332 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
333 | rm -f tmp-sync/test1a/file1 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
334 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
335 | dav_sync_push test1a "test 9: push failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
336 | check_tmpout "1 file deleted" "test 9: wrong delete counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
337 | check_tmpout "0 conflicts" "test 9: wrong conflict counter" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
338 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
339 | echo "conflict1-test9-conflict" >> tmp-sync/test1b/file1 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
340 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
341 | dav_sync_pull test1b "test 9: pull failed" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
342 | # don't check conflict counter |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
343 | TEST=`cat tmp-sync/out.txt | grep "1 file deleted"` |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
344 | if [ $? -eq 0 ]; |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
345 | then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
346 | echo "test 9: file1 deleted" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
347 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
348 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
349 | |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
350 | cat tmp-sync/test1b/file1 > /dev/null 2>&1 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
351 | if [ $? -ne 0 ]; then |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
352 | echo "test 9: file1 deleted (2)" |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
353 | exit 2 |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
354 | fi |
2e1b59290829
rename conflict test script
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
355 |