Sat, 20 Apr 2024 12:43:44 +0200
improve xattr code
- check allocation return value
- xattr_get returns null terminated strings
678
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | #!/bin/sh |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | # |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
4 | # |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | # Copyright 2019 Olaf Wintermann. All rights reserved. |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | # |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | # Redistribution and use in source and binary forms, with or without |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | # modification, are permitted provided that the following conditions are met: |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | # |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | # 1. Redistributions of source code must retain the above copyright |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | # notice, this list of conditions and the following disclaimer. |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | # |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | # 2. Redistributions in binary form must reproduce the above copyright |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | # notice, this list of conditions and the following disclaimer in the |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | # documentation and/or other materials provided with the distribution. |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | # |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
41b4cc024249
add tests for tag conflict resolution
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 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | # POSSIBILITY OF SUCH DAMAGE. |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | # |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | if [ -z "$DAV_BIN" ]; |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | echo "DAV_BIN variable not set" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
33 | exit 1 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
34 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | if [ -z "$DAV_SYNC_BIN" ]; |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
36 | then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
37 | echo "DAV_BIN variable not set" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | exit 1 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
39 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | |
770
fcb243cb9950
fix xattrtool path in metadata test scripts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
678
diff
changeset
|
41 | XATTR=../../build/bin/xattrtool |
678
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
42 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | # checks if tmp-sync/out.txt contains a specific text |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | # arg1: pattern |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | # arg2: errormsg |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
46 | check_tmpout() |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
47 | { |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | TEST=`cat tmp-sync/out.txt | grep "$1"` |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | if [ $? -ne 0 ]; |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
50 | then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
51 | echo "$2" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
52 | exit 2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
53 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
54 | } |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
55 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
56 | # checks if tmp-sync/out.txt does not contain a specific text |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | # arg1: pattern |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
58 | # arg2: errormsg |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
59 | ncheck_tmpout() |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
60 | { |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | TEST=`cat tmp-sync/out.txt | grep "$1"` |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
62 | if [ $? -eq 0 ]; |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
63 | then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
64 | echo "$2" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
65 | exit 2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
66 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
67 | } |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
68 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
69 | # do dav-sync push and check return value |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
70 | # arg1: dir |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
71 | # arg2: errormsg |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
72 | dav_sync_push() |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
73 | { |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
74 | $DAV_SYNC_BIN push $1 > tmp-sync/out.txt |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
75 | if [ $? -ne 0 ]; |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
76 | then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
77 | echo "$2" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
78 | exit 2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
79 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
80 | } |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | # do dav-sync pull and check return value |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | # arg1: dir |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
83 | # arg2: errormsg |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
84 | dav_sync_pull() |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
85 | { |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
86 | $DAV_SYNC_BIN pull $1 > tmp-sync/out.txt |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
87 | if [ $? -ne 0 ]; |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
88 | then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
89 | echo "$2" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
90 | exit 2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
91 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
92 | } |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
93 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
94 | rm -f .dav/dav-sync-tests-test4akl-db.xml |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
95 | rm -f .dav/dav-sync-tests-test4bkr-db.xml |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
96 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
97 | $DAV_BIN rm dav-test-repo/sync/test4 2> /dev/null |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
98 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
99 | $DAV_BIN mkcol dav-test-repo/sync/test4 2> /dev/null |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
100 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
101 | # tmp sync dir |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
102 | rm -Rf tmp-sync |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
103 | mkdir tmp-sync |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
104 | mkdir tmp-sync/test4akl |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
105 | mkdir tmp-sync/test4bkr |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
106 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
107 | # ---------------------------------------------------------------------------- |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
108 | # test 1: add some files with tags and sync |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
109 | # expected result: everything synced |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
110 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
111 | cp synctest/file1 tmp-sync/test4akl/ |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
112 | cp synctest/file2 tmp-sync/test4akl/ |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
113 | cp synctest/file3 tmp-sync/test4akl/ |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
114 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
115 | $DAV_SYNC_BIN add-tag -s test4akl tmp-sync/test4akl/file1 mytag1 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
116 | $DAV_SYNC_BIN add-tag -s test4akl tmp-sync/test4akl/file2 mytag1 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
117 | $DAV_SYNC_BIN add-tag -s test4akl tmp-sync/test4akl/file3 mytag1 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
118 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
119 | $DAV_SYNC_BIN add-tag -s test4akl tmp-sync/test4akl/file1 tt1 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
120 | $DAV_SYNC_BIN add-tag -s test4akl tmp-sync/test4akl/file2 tt1 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
121 | $DAV_SYNC_BIN add-tag -s test4akl tmp-sync/test4akl/file3 tt1 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
122 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
123 | dav_sync_push test4akl "test 1: push failed" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
124 | check_tmpout "3 files pushed" "test 1: wrong push counter" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
125 | check_tmpout "0 conflicts" "test 1: wrong conflict counter (push)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
126 | check_tmpout "0 errors" "test 1: wrong error counter (push)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
127 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
128 | dav_sync_pull test4bkr "test 1: pull failed" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
129 | check_tmpout "3 files pulled" "test 1: wrong pull counter" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
130 | check_tmpout "0 conflicts" "test 1: wrong conflict counter (pull)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
131 | check_tmpout "0 errors" "test 1: wrong error counter (pull)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
132 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
133 | TAGS=`$DAV_SYNC_BIN list-tags -s test4bkr tmp-sync/test4bkr/file1 > tmp-sync/out.txt 2> /dev/null` |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
134 | if [ $? -ne 0 ]; then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
135 | echo "test 1: list-tags failed (file1)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
136 | exit 2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
137 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
138 | check_tmpout "mytag1" "test 1: file1: missing tag mytag1" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
139 | check_tmpout "tt1" "test 1: file1: missing tag tt1" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
140 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
141 | TAGS=`$DAV_SYNC_BIN list-tags -s test4bkr tmp-sync/test4bkr/file2 > tmp-sync/out.txt 2> /dev/null` |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
142 | if [ $? -ne 0 ]; then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
143 | echo "test 1: list-tags failed (file2)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
144 | exit 2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
145 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
146 | check_tmpout "mytag1" "test 1: file2: missing tag mytag1" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
147 | check_tmpout "tt1" "test 1: file2: missing tag tt1" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
148 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
149 | TAGS=`$DAV_SYNC_BIN list-tags -s test4bkr tmp-sync/test4bkr/file3 > tmp-sync/out.txt 2> /dev/null` |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
150 | if [ $? -ne 0 ]; then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
151 | echo "test 1: list-tags failed (file3)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
152 | exit 2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
153 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
154 | check_tmpout "mytag1" "test 1: file3: missing tag mytag1" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
155 | check_tmpout "tt1" "test 1: file3: missing tag tt1" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
156 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
157 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
158 | # ---------------------------------------------------------------------------- |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
159 | # test 2: modify tags on both sides and push b, push a, pull b |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
160 | # expected result: tags from a used |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
161 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
162 | # changes in test4kl |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
163 | $DAV_SYNC_BIN remove-tag -s test4akl tmp-sync/test4akl/file1 mytag1 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
164 | $DAV_SYNC_BIN set-tags -s test4akl tmp-sync/test4akl/file2 tt2a |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
165 | $DAV_SYNC_BIN add-tag -s test4akl tmp-sync/test4akl/file3 mytag2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
166 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
167 | # changes in test4bkr |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
168 | $DAV_SYNC_BIN add-tag -s test4bkr tmp-sync/test4bkr/file1 tt2b |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
169 | $DAV_SYNC_BIN set-tags -s test4bkr tmp-sync/test4bkr/file2 tt2b |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
170 | $DAV_SYNC_BIN remove-tag -s test4bkr tmp-sync/test4bkr/file3 mytag1 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
171 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
172 | dav_sync_push test4bkr "test 2: push b failed" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
173 | check_tmpout "0 conflicts" "test 2: wrong conflict counter (push b)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
174 | check_tmpout "0 errors" "test 2: wrong error counter (push b)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
175 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
176 | dav_sync_push test4akl "test 2: push failed" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
177 | check_tmpout "0 conflicts" "test 2: wrong conflict counter (push)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
178 | check_tmpout "0 errors" "test 2: wrong error counter (push)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
179 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
180 | dav_sync_pull test4bkr "test 2: pull failed" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
181 | check_tmpout "0 conflicts" "test 2: wrong conflict counter (pull)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
182 | check_tmpout "0 errors" "test 2: wrong error counter (pull)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
183 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
184 | TAGS=`$DAV_SYNC_BIN list-tags -s test4bkr tmp-sync/test4bkr/file1 > tmp-sync/out.txt 2> /dev/null` |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
185 | if [ $? -ne 0 ]; then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
186 | echo "test 1: list-tags failed (file1)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
187 | exit 2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
188 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
189 | ncheck_tmpout "mytag1" "test 2: file1: tag mytag1" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
190 | check_tmpout "tt1" "test 2: file1: tag tt1" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
191 | ncheck_tmpout "tt2" "test 2: file1: tag tt2" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
192 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
193 | TAGS=`$DAV_SYNC_BIN list-tags -s test4bkr tmp-sync/test4bkr/file2 > tmp-sync/out.txt 2> /dev/null` |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
194 | if [ $? -ne 0 ]; then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
195 | echo "test 2: list-tags failed (file2)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
196 | exit 2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
197 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
198 | check_tmpout "tt2a" "test 2: file2: tt2a" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
199 | ncheck_tmpout "tt2b" "test 2: file2: tt2b" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
200 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
201 | TAGS=`$DAV_SYNC_BIN list-tags -s test4bkr tmp-sync/test4bkr/file3 > tmp-sync/out.txt 2> /dev/null` |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
202 | if [ $? -ne 0 ]; then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
203 | echo "test 2: list-tags failed (file3)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
204 | exit 2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
205 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
206 | check_tmpout "mytag1" "test 3: file3: tag mytag1" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
207 | check_tmpout "tt1" "test 3: file3: tag tt1" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
208 | check_tmpout "mytag2" "test 3: file3: tag mytag2" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
209 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
210 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
211 | # ---------------------------------------------------------------------------- |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
212 | # test 3: modify tags on both sides and push a, push b, pull a |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
213 | # expected result: tags from a used |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
214 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
215 | # changes in test4kl |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
216 | $DAV_SYNC_BIN add-tag -s test4akl tmp-sync/test4akl/file1 mytag3 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
217 | $DAV_SYNC_BIN set-tags -s test4akl tmp-sync/test4akl/file2 tt3a |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
218 | $DAV_SYNC_BIN remove-tag -s test4akl tmp-sync/test4akl/file3 mytag2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
219 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
220 | # changes in test4bkr |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
221 | $DAV_SYNC_BIN remove-tag -s test4bkr tmp-sync/test4bkr/file1 tt1 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
222 | $DAV_SYNC_BIN set-tags -s test4bkr tmp-sync/test4bkr/file2 tt3b |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
223 | $DAV_SYNC_BIN add-tag -s test4bkr tmp-sync/test4bkr/file3 mytag3 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
224 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
225 | dav_sync_push test4akl "test 3: push a failed" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
226 | check_tmpout "0 conflicts" "test 3: wrong conflict counter (push a)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
227 | check_tmpout "0 errors" "test 3: wrong error counter (push a)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
228 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
229 | dav_sync_push test4bkr "test 3: push failed" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
230 | check_tmpout "0 conflicts" "test 3: wrong conflict counter (push)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
231 | check_tmpout "0 errors" "test 3: wrong error counter (push)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
232 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
233 | dav_sync_pull test4akl "test 3: pull failed" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
234 | check_tmpout "0 conflicts" "test 3: wrong conflict counter (pull)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
235 | check_tmpout "0 errors" "test 3: wrong error counter (pull)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
236 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
237 | TAGS=`$DAV_SYNC_BIN list-tags -s test4akl tmp-sync/test4akl/file1 > tmp-sync/out.txt 2> /dev/null` |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
238 | if [ $? -ne 0 ]; then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
239 | echo "test 3: list-tags failed (file1)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
240 | exit 2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
241 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
242 | check_tmpout "mytag3" "test 3: file1: tag mytag3" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
243 | check_tmpout "tt1" "test 3: file1: tag tt1" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
244 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
245 | TAGS=`$DAV_SYNC_BIN list-tags -s test4akl tmp-sync/test4akl/file2 > tmp-sync/out.txt 2> /dev/null` |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
246 | if [ $? -ne 0 ]; then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
247 | echo "test 3: list-tags failed (file2)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
248 | exit 2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
249 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
250 | check_tmpout "tt3a" "test 2: file2: tt3a" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
251 | ncheck_tmpout "tt3b" "test 2: file2: tt3b" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
252 | |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
253 | TAGS=`$DAV_SYNC_BIN list-tags -s test4akl tmp-sync/test4akl/file3 > tmp-sync/out.txt 2> /dev/null` |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
254 | if [ $? -ne 0 ]; then |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
255 | echo "test 3: list-tags failed (file3)" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
256 | exit 2 |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
257 | fi |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
258 | check_tmpout "mytag1" "test 3: file3: tag mytag1" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
259 | check_tmpout "tt1" "test 3: file3: tag tt1" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
260 | ncheck_tmpout "mytag2" "test 3: file3: tag mytag2" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
261 | ncheck_tmpout "mytag2" "test 3: file3: tag mytag3" |
41b4cc024249
add tests for tag conflict resolution
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
262 |