mirror of
https://github.com/deajan/osync
synced 2024-11-07 15:20:26 +00:00
Trying various travis fixes
This commit is contained in:
parent
f0f3cd64b1
commit
7ddd13f122
@ -5,7 +5,7 @@
|
||||
|
||||
## On CYGWIN / MSYS, ACL and extended attributes aren't supported
|
||||
|
||||
# osync test suite 2018070201
|
||||
# osync test suite 2018070202
|
||||
|
||||
# 4 tests:
|
||||
# quicklocal
|
||||
@ -265,8 +265,9 @@ function oneTimeSetUp () {
|
||||
}
|
||||
|
||||
function oneTimeTearDown () {
|
||||
|
||||
# Set osync version stable flag back to origin
|
||||
SetConfFileValue "$OSYNC_DIR/osync.sh" "IS_STABLE" "$OSYNC_IS_STABLE"
|
||||
#SetConfFileValue "$OSYNC_DIR/osync.sh" "IS_STABLE" "$OSYNC_IS_STABLE"
|
||||
|
||||
RemoveSSH
|
||||
|
||||
@ -298,7 +299,9 @@ function test_Merge () {
|
||||
cd "$OSYNC_DIR"
|
||||
|
||||
# Set osync version to stable while testing to avoid warning message
|
||||
SetConfFileValue "$OSYNC_DIR/osync.sh" "IS_STABLE" "yes"
|
||||
# Don't use SetConfFileValue here since for whatever reason Travis does not like creating a sed temporary file in $FAKEROOT
|
||||
sed -i.tmp "s/IS_STABLE=*/IS_STABLE=yes" "$OSYNC_EXECUTABLE"
|
||||
#SetConfFileValue "$OSYNC_EXECUTABLE" "IS_STABLE" "yes"
|
||||
|
||||
echo ""
|
||||
echo "Installing osync to $FAKEROOT"
|
||||
@ -306,7 +309,7 @@ function test_Merge () {
|
||||
assertEquals "Install failed" "0" $?
|
||||
}
|
||||
|
||||
function test_LargeFileSet () {
|
||||
function nope_test_LargeFileSet () {
|
||||
for i in "${osyncParameters[@]}"; do
|
||||
cd "$OSYNC_DIR"
|
||||
|
||||
@ -324,7 +327,7 @@ function test_LargeFileSet () {
|
||||
done
|
||||
}
|
||||
|
||||
function test_Exclusions () {
|
||||
function nope_test_Exclusions () {
|
||||
# Will sync except php files
|
||||
# RSYNC_EXCLUDE_PATTERN="*.php" is set at runtime for quicksync and in config files for other runs
|
||||
|
||||
@ -352,7 +355,7 @@ function test_Exclusions () {
|
||||
done
|
||||
}
|
||||
|
||||
function test_Deletetion () {
|
||||
function nope_test_Deletetion () {
|
||||
local iFile1="$INITIATOR_DIR/ific"
|
||||
local iFile2="$INITIATOR_DIR/ifoc"
|
||||
local tFile1="$TARGET_DIR/tfic"
|
||||
@ -396,7 +399,7 @@ function test_Deletetion () {
|
||||
done
|
||||
}
|
||||
|
||||
function test_deletion_failure () {
|
||||
function nope_test_deletion_failure () {
|
||||
if [ "$LOCAL_OS" == "WinNT10" ] || [ "$LOCAL_OS" == "msys" ] || [ "$LOCAL_OS" == "Cygwin" ]; then
|
||||
echo "Skipping deletion failure test as Win10 does not have chattr support."
|
||||
return 0
|
||||
@ -463,7 +466,7 @@ function test_deletion_failure () {
|
||||
done
|
||||
}
|
||||
|
||||
function test_skip_deletion () {
|
||||
function nope_test_skip_deletion () {
|
||||
local modes
|
||||
|
||||
if [ "$OSYNC_MIN_VERSION" == "1" ]; then
|
||||
@ -539,7 +542,7 @@ function test_skip_deletion () {
|
||||
SetConfFileValue "$CONF_DIR/$REMOTE_CONF" "SKIP_DELETION" ""
|
||||
}
|
||||
|
||||
function test_handle_symlinks () {
|
||||
function nope_test_handle_symlinks () {
|
||||
if [ "$OSYNC_MIN_VERSION" == "1" ]; then
|
||||
echo "Skipping symlink tests as osync v1.1x didn't handle this."
|
||||
return 0
|
||||
@ -720,7 +723,7 @@ function test_handle_symlinks () {
|
||||
done
|
||||
}
|
||||
|
||||
function test_softdeletion_cleanup () {
|
||||
function nope_test_softdeletion_cleanup () {
|
||||
#declare -A files
|
||||
|
||||
files=()
|
||||
@ -797,7 +800,7 @@ function test_softdeletion_cleanup () {
|
||||
|
||||
}
|
||||
|
||||
function test_FileAttributePropagation () {
|
||||
function nope_test_FileAttributePropagation () {
|
||||
|
||||
if [ "$TRAVIS_RUN" == true ]; then
|
||||
echo "Skipping FileAttributePropagation tests as travis does not support getfacl / setfacl."
|
||||
@ -875,7 +878,7 @@ function test_FileAttributePropagation () {
|
||||
done
|
||||
}
|
||||
|
||||
function test_ConflictBackups () {
|
||||
function nope_test_ConflictBackups () {
|
||||
for i in "${osyncParameters[@]}"; do
|
||||
cd "$OSYNC_DIR"
|
||||
PrepareLocalDirs
|
||||
@ -911,7 +914,7 @@ function test_ConflictBackups () {
|
||||
done
|
||||
}
|
||||
|
||||
function test_MultipleConflictBackups () {
|
||||
function nope_test_MultipleConflictBackups () {
|
||||
|
||||
local additionalParameters
|
||||
|
||||
@ -973,7 +976,7 @@ function test_MultipleConflictBackups () {
|
||||
SetConfFileValue "$CONF_DIR/$REMOTE_CONF" "CONFLICT_BACKUP_MULTIPLE" "no"
|
||||
}
|
||||
|
||||
function test_Locking () {
|
||||
function nope_test_Locking () {
|
||||
# local not running = resume
|
||||
# remote same instance_id = resume
|
||||
# remote different instance_id = stop
|
||||
@ -1080,7 +1083,7 @@ function test_Locking () {
|
||||
SetConfFileValue "$CONF_DIR/$REMOTE_CONF" "FORCE_STRANGER_LOCK_RESUME" "no"
|
||||
}
|
||||
|
||||
function nope_test_ConflictDetetion () {
|
||||
function test_ConflictDetetion () {
|
||||
local result
|
||||
|
||||
# Tests compatible with v1.3+
|
||||
@ -1131,7 +1134,7 @@ function nope_test_ConflictDetetion () {
|
||||
done
|
||||
}
|
||||
|
||||
function test_WaitForTaskCompletion () {
|
||||
function nope_test_WaitForTaskCompletion () {
|
||||
local pids
|
||||
|
||||
# Tests compatible with v1.1 syntax
|
||||
@ -1225,7 +1228,7 @@ function test_WaitForTaskCompletion () {
|
||||
assertEquals "WaitForTaskCompletion test 5" "2" $?
|
||||
}
|
||||
|
||||
function test_ParallelExec () {
|
||||
function nope_test_ParallelExec () {
|
||||
if [ "$OSYNC_MIN_VERSION" == "1" ]; then
|
||||
echo "Skipping ParallelExec test because osync v1.1 ofunctions don't have this function."
|
||||
return 0
|
||||
@ -1286,7 +1289,7 @@ function test_ParallelExec () {
|
||||
assertNotEquals "ParallelExec full test 3" "0" $?
|
||||
}
|
||||
|
||||
function test_timedExecution () {
|
||||
function nope_test_timedExecution () {
|
||||
local arguments
|
||||
local warnExitCode
|
||||
|
||||
@ -1333,7 +1336,7 @@ function test_timedExecution () {
|
||||
done
|
||||
}
|
||||
|
||||
function test_UpgradeConfRun () {
|
||||
function nope_test_UpgradeConfRun () {
|
||||
if [ "$OSYNC_MIN_VERSION" == "1" ]; then
|
||||
echo "Skipping Upgrade script test because no further dev will happen on this for v1.1"
|
||||
return 0
|
||||
@ -1359,7 +1362,7 @@ function test_UpgradeConfRun () {
|
||||
rm -f "$CONF_DIR/$TMP_OLD_CONF.save"
|
||||
}
|
||||
|
||||
function test_DaemonMode () {
|
||||
function nope_test_DaemonMode () {
|
||||
if [ "$LOCAL_OS" == "WinNT10" ] || [ "$LOCAL_OS" == "msys" ] || [ "$LOCAL_OS" == "Cygwin" ]; then
|
||||
echo "Skipping daemon mode test as [$LOCAL_OS] does not have inotifywait support."
|
||||
return 0
|
||||
@ -1414,7 +1417,7 @@ function test_DaemonMode () {
|
||||
|
||||
}
|
||||
|
||||
function test_NoRemoteAccessTest () {
|
||||
function nope_test_NoRemoteAccessTest () {
|
||||
RemoveSSH
|
||||
|
||||
cd "$OSYNC_DIR"
|
||||
|
Loading…
Reference in New Issue
Block a user