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

Isolate conflict detect bug

This commit is contained in:
deajan 2018-10-05 00:51:20 +02:00
parent e411c81f3d
commit 58e5c654d3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/tests/run_tests.sh
View File

@ -1139,10 +1139,12 @@ function test_ConflictDetetion () {
# Now run should return conflicts # Now run should return conflicts
REMOTE_HOST_PING=$RHOST_PING $OSYNC_EXECUTABLE $i --log-conflicts REMOTE_HOST_PING=$RHOST_PING $OSYNC_EXECUTABLE $i --log-conflicts > "$FAKEROOT/output.log" 2>&1
result=$? result=$?
assertEquals "Second run that should detect conflicts with parameters [$i]." "0" $result assertEquals "Second run that should detect conflicts with parameters [$i]." "0" $result
cat "$FAKEROOT/output.log"
grep "$INITIATOR_DIR/$FileA << >> $TARGET_DIR/$FileA" "$FAKEROOT/output.log" grep "$INITIATOR_DIR/$FileA << >> $TARGET_DIR/$FileA" "$FAKEROOT/output.log"
assertEquals "FileA conflict detect with parameters [$i]." "0" $? assertEquals "FileA conflict detect with parameters [$i]." "0" $?