WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another msys fix

This commit is contained in:
deajan 2016-12-08 12:09:52 +01:00
parent 467cb717ad
commit 696140b575
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev/tests/run_tests.sh
View File

@ -7,7 +7,7 @@
## On CYGWIN / MSYS, ACL and extended attributes aren't supported ## On CYGWIN / MSYS, ACL and extended attributes aren't supported
# osync test suite 2016120801 # osync test suite 2016120802
# 4 tests: # 4 tests:
# quicklocal # quicklocal
@ -974,6 +974,7 @@ function test_Locking () {
REMOTE_HOST_PING=no ./$OSYNC_EXECUTABLE ${osyncParameters[$__confLocal]} REMOTE_HOST_PING=no ./$OSYNC_EXECUTABLE ${osyncParameters[$__confLocal]}
assertEquals "Should be able to resume locked target with same instance_id in confLocal mode." "0" $? assertEquals "Should be able to resume locked target with same instance_id in confLocal mode." "0" $?
if [ "$LOCAL_OS" != "msys" ]; then
PrepareLocalDirs PrepareLocalDirs
mkdir -p "$TARGET_DIR/$OSYNC_WORKDIR" mkdir -p "$TARGET_DIR/$OSYNC_WORKDIR"
echo 65536@quickremote > "$TARGET_DIR/$OSYNC_WORKDIR/lock" echo 65536@quickremote > "$TARGET_DIR/$OSYNC_WORKDIR/lock"
@ -987,6 +988,7 @@ function test_Locking () {
REMOTE_HOST_PING=no ./$OSYNC_EXECUTABLE ${osyncParameters[$__confRemote]} REMOTE_HOST_PING=no ./$OSYNC_EXECUTABLE ${osyncParameters[$__confRemote]}
assertEquals "Should be able to resume locked target with same instance_id in confRemote mode." "0" $? assertEquals "Should be able to resume locked target with same instance_id in confRemote mode." "0" $?
fi
# Remote Target lock present should not be resumed if instance ID is NOT the same as current one, local target lock is resumed # Remote Target lock present should not be resumed if instance ID is NOT the same as current one, local target lock is resumed
PrepareLocalDirs PrepareLocalDirs
@ -1003,6 +1005,7 @@ function test_Locking () {
REMOTE_HOST_PING=no ./$OSYNC_EXECUTABLE ${osyncParameters[$__confLocal]} REMOTE_HOST_PING=no ./$OSYNC_EXECUTABLE ${osyncParameters[$__confLocal]}
assertEquals "Should be able to resume locked local target with bogus instance_id in confLocal mode." "0" $? assertEquals "Should be able to resume locked local target with bogus instance_id in confLocal mode." "0" $?
if [ "$LOCAL_OS" != "msys" ]; then
PrepareLocalDirs PrepareLocalDirs
mkdir -p "$TARGET_DIR/$OSYNC_WORKDIR" mkdir -p "$TARGET_DIR/$OSYNC_WORKDIR"
echo 65536@bogusinstance > "$TARGET_DIR/$OSYNC_WORKDIR/lock" echo 65536@bogusinstance > "$TARGET_DIR/$OSYNC_WORKDIR/lock"
@ -1016,6 +1019,7 @@ function test_Locking () {
REMOTE_HOST_PING=no ./$OSYNC_EXECUTABLE ${osyncParameters[$__confRemote]} REMOTE_HOST_PING=no ./$OSYNC_EXECUTABLE ${osyncParameters[$__confRemote]}
assertEquals "Should not be able to resume remote locked target with bogus instance_id in confRemote mode." "1" $? assertEquals "Should not be able to resume remote locked target with bogus instance_id in confRemote mode." "1" $?
fi
# Target lock present should be resumed if instance ID is NOT the same as current one but FORCE_STRANGER_UNLOCK=yes # Target lock present should be resumed if instance ID is NOT the same as current one but FORCE_STRANGER_UNLOCK=yes