Removed double debug logs
This commit is contained in:
parent
57647b8960
commit
e411c81f3d
|
@ -1139,16 +1139,10 @@ function test_ConflictDetetion () {
|
||||||
|
|
||||||
# Now run should return conflicts
|
# Now run should return conflicts
|
||||||
|
|
||||||
REMOTE_HOST_PING=$RHOST_PING $OSYNC_EXECUTABLE $i --log-conflicts > "$FAKEROOT/output.log" 2>&1
|
REMOTE_HOST_PING=$RHOST_PING $OSYNC_EXECUTABLE $i --log-conflicts
|
||||||
result=$?
|
result=$?
|
||||||
cat "$FAKEROOT/output.log"
|
|
||||||
assertEquals "Second run that should detect conflicts with parameters [$i]." "0" $result
|
assertEquals "Second run that should detect conflicts with parameters [$i]." "0" $result
|
||||||
|
|
||||||
if [ $TRAVIS_RUN == true ]; then
|
|
||||||
echo "Travis Debug output"
|
|
||||||
cat "$FAKEROOT/output.log"
|
|
||||||
fi
|
|
||||||
|
|
||||||
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" $?
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue