Sat, 07 Sep 2019 19:25:51 +0200
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
#!/bin/sh # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # # Copyright 2019 Olaf Wintermann. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # if [ -z "$DAV_BIN" ]; then echo "DAV_BIN variable not set" exit 1 fi if [ -z "$DAV_SYNC_BIN" ]; then echo "DAV_BIN variable not set" exit 1 fi # checks if tmp-sync/out.txt contains a specific text # arg1: pattern # arg2: errormsg check_tmpout() { TEST=`cat tmp-sync/out.txt | grep "$1"` if [ $? -ne 0 ]; then echo "$2" exit 2 fi } # do dav-sync push and check return value # arg1: dir # arg2: errormsg dav_sync_push() { $DAV_SYNC_BIN push $1 > tmp-sync/out.txt if [ $? -ne 0 ]; then echo "$2" exit 2 fi } # do dav-sync pull and check return value # arg1: dir # arg2: errormsg dav_sync_pull() { $DAV_SYNC_BIN pull $1 > tmp-sync/out.txt if [ $? -ne 0 ]; then echo "$2" exit 2 fi } rm -f .dav/dav-sync-tests-test2a-db.xml rm -f .dav/dav-sync-tests-test2b-db.xml $DAV_BIN rm dav-test-repo/sync/test2 2> /dev/null $DAV_BIN mkcol dav-test-repo/sync/test2 2> /dev/null # tmp sync dir rm -Rf tmp-sync mkdir tmp-sync mkdir tmp-sync/test2a mkdir tmp-sync/test2b # ---------------------------------------------------------------------------- # 1. test: add 4 files, push, pull (not really an hashing test) # expected result: 4 files pushed, 4 files pulled mkdir tmp-sync/test2a/dir1/ mkdir tmp-sync/test2a/dir1/subdir1/ cp synctest/file1 tmp-sync/test2a/ cp synctest/file2 tmp-sync/test2a/dir1/ cp synctest/file3 tmp-sync/test2a/dir1/subdir1 cp synctest/file4 tmp-sync/test2a/dir1/subdir1 dav_sync_push test2a "test 1: push failed" check_tmpout "4 files pushed" "test 1: wrong push counter" check_tmpout "0 conflicts" "test 1: wrong conflict counter (push)" check_tmpout "0 errors" "test 1: wrong error counter (push)" dav_sync_pull test2b "test 1: pull failed" check_tmpout "4 files pulled" "test 1: wrong pull counter" check_tmpout "0 conflicts" "test 1: wrong conflict counter (pull)" check_tmpout "0 errors" "test 1: wrong error counter (pull)" # ---------------------------------------------------------------------------- # 2. test: touch 2 files, push # expected result: 0 files pushed sleep 3 touch tmp-sync/test2a/file1 touch tmp-sync/test2a/dir1/file2 dav_sync_push test2a "test 2: push failed" check_tmpout "0 files pushed" "test 2: wrong push counter" check_tmpout "0 conflicts" "test 2: wrong conflict counter" check_tmpout "0 errors" "test 2: wrong error counter" # ---------------------------------------------------------------------------- # 3. test: copy fil1 to test2a again # expected result: 0 files pushed sleep 3 cp synctest/file1 tmp-sync/test2a/ dav_sync_push test2a "test 3: push failed" check_tmpout "0 files pushed" "test 3: wrong push counter" check_tmpout "0 conflicts" "test 3: wrong conflict counter" check_tmpout "0 errors" "test 3: wrong error counter" # ---------------------------------------------------------------------------- # 4. test: change content but don't change mtime # expected result: 1 file pushed # modify file and mtime to update mtime in the database echo "test4-change1-a" >> tmp-sync/test2a/file1 touch -t 01011200 tmp-sync/test2a/file1 dav_sync_push test2a "test 4: push failed (1)" check_tmpout "1 file pushed" "test 4: wrong push counter (1)" check_tmpout "0 conflicts" "test 4: wrong conflict counter (1)" check_tmpout "0 errors" "test 4: wrong error counter (1)" # modify file again and set mtime to same value echo "test4-change2-a" >> tmp-sync/test2a/file1 touch -t 01011200 tmp-sync/test2a/file1 dav_sync_push test2a "test 4: push failed (2)" check_tmpout "1 file pushed" "test 4: wrong push counter (2)" check_tmpout "0 conflicts" "test 4: wrong conflict counter (2)" check_tmpout "0 errors" "test 4: wrong error counter (2)" # ---------------------------------------------------------------------------- # 5. test: set same content on both sides # expected result: no conflict # prepare test2b dav_sync_pull test2b "test 5: pull failed" check_tmpout "1 file pulled" "test 5: wrong pull counter" check_tmpout "0 conflicts" "test 5: wrong conflict counter (prepare)" check_tmpout "0 errors" "test 5: wrong error counter (prepare)" # change content on both sides echo "test5-change" >> tmp-sync/test2a/file1 echo "test5-change" >> tmp-sync/test2b/file1 # push both sides dav_sync_push test2a "test 5: push failed (test2a)" check_tmpout "1 file pushed" "test 5: wrong push counter (test2a)" check_tmpout "0 conflicts" "test 5: wrong conflict counter (test2a)" check_tmpout "0 errors" "test 5: wrong error counter (test2a)" dav_sync_push test2b "test 5: push failed (test2b)" # don't check push counter check_tmpout "0 conflicts" "test 5: wrong conflict counter (test2b)" check_tmpout "0 errors" "test 5: wrong error counter (test2b)"