# HG changeset patch # User Olaf Wintermann # Date 1688288888 -7200 # Node ID fcb243cb99501110ece8d2b191950cb75c16af31 # Parent 24b317ce5ca91463e299fdcee422709f129076ec fix xattrtool path in metadata test scripts diff -r 24b317ce5ca9 -r fcb243cb9950 test/bin-test/test-dav-sync-metadata2.sh --- a/test/bin-test/test-dav-sync-metadata2.sh Sun Jul 02 11:06:14 2023 +0200 +++ b/test/bin-test/test-dav-sync-metadata2.sh Sun Jul 02 11:08:08 2023 +0200 @@ -38,7 +38,7 @@ exit 1 fi -XATTR=../../build/xattrtool +XATTR=../../build/bin/xattrtool # checks if tmp-sync/out.txt contains a specific text # arg1: pattern @@ -111,6 +111,7 @@ $DAV_SYNC_BIN add-tag -s test4a tmp-sync/test4a/dir1/file3 sub + $DAV_SYNC_BIN push test4a -t test1 > tmp-sync/out.txt if [ $? -ne 0 ]; then @@ -126,6 +127,7 @@ check_tmpout "0 conflicts" "test 1: wrong conflict counter (pull)" check_tmpout "0 errors" "test 1: wrong error counter (pull)" + cat tmp-sync/test4b/dir1/file3 > /dev/null 2>&1 if [ $? -eq 0 ]; then echo "test 1: file 3 must not be synced" @@ -156,6 +158,7 @@ check_tmpout "update: /file1" "test 3: file1 not updated (push)" check_tmpout "update: /dir1/file3" "test 3: file3 not updated (push)" + $DAV_SYNC_BIN pull test4b -t test3 > tmp-sync/out.txt if [ $? -ne 0 ]; then diff -r 24b317ce5ca9 -r fcb243cb9950 test/bin-test/test-dav-sync-metadata3.sh --- a/test/bin-test/test-dav-sync-metadata3.sh Sun Jul 02 11:06:14 2023 +0200 +++ b/test/bin-test/test-dav-sync-metadata3.sh Sun Jul 02 11:08:08 2023 +0200 @@ -38,7 +38,7 @@ exit 1 fi -XATTR=../../build/xattrtool +XATTR=../../build/bin/xattrtool # checks if tmp-sync/out.txt contains a specific text # arg1: pattern diff -r 24b317ce5ca9 -r fcb243cb9950 test/bin-test/test-dav-sync-metadata4.sh --- a/test/bin-test/test-dav-sync-metadata4.sh Sun Jul 02 11:06:14 2023 +0200 +++ b/test/bin-test/test-dav-sync-metadata4.sh Sun Jul 02 11:08:08 2023 +0200 @@ -38,7 +38,7 @@ exit 1 fi -XATTR=../../build/xattrtool +XATTR=../../build/bin/xattrtool # checks if tmp-sync/out.txt contains a specific text # arg1: pattern diff -r 24b317ce5ca9 -r fcb243cb9950 test/bin-test/test-dav-sync.sh --- a/test/bin-test/test-dav-sync.sh Sun Jul 02 11:06:14 2023 +0200 +++ b/test/bin-test/test-dav-sync.sh Sun Jul 02 11:08:08 2023 +0200 @@ -101,8 +101,8 @@ #do_test "dav-sync hash strategy" test-dav-sync-hash-strategy.sh #do_test "dav-sync hash conflict resolution" test-dav-sync-hash-conflictres.sh #do_test "dav-sync hashing change cfg" test-dav-sync-hashing-cfgchange.sh -do_test "dav-sync metadata (1)" test-dav-sync-metadata1.sh -do_test "dav-sync metadata (2)" test-dav-sync-metadata2.sh +#do_test "dav-sync metadata (1)" test-dav-sync-metadata1.sh +#do_test "dav-sync metadata (2)" test-dav-sync-metadata2.sh do_test "dav-sync metadata (3)" test-dav-sync-metadata3.sh do_test "dav-sync metadata (4)" test-dav-sync-metadata4.sh do_test "dav-sync versioning (1)" test-dav-sync-versioning1.sh