From 5ef5297ac50ba32565ce0e37c4a77c10683e833e Mon Sep 17 00:00:00 2001 From: deajan Date: Wed, 30 Nov 2016 12:59:52 +0100 Subject: [PATCH] Reenabled all tests again --- dev/tests/run_tests.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh index 24d063f..8687c87 100755 --- a/dev/tests/run_tests.sh +++ b/dev/tests/run_tests.sh @@ -265,7 +265,7 @@ function test_Merge () { SetConfFileValue "$OSYNC_DIR/$OSYNC_EXECUTABLE" "IS_STABLE" "yes" } -function nope_test_LargeFileSet () { +function test_LargeFileSet () { for i in "${osyncParameters[@]}"; do cd "$OSYNC_DIR" @@ -283,7 +283,7 @@ function nope_test_LargeFileSet () { done } -function nope_test_Exclusions () { +function test_Exclusions () { # Will sync except php files # RSYNC_EXCLUDE_PATTERN="*.php" is set at runtime for quicksync and in config files for other runs @@ -311,7 +311,7 @@ function nope_test_Exclusions () { done } -function nope_test_Deletetion () { +function test_Deletetion () { local iFile1="$INITIATOR_DIR/ific" local iFile2="$INITIATOR_DIR/ifoc" local tFile1="$TARGET_DIR/tfic" @@ -355,7 +355,7 @@ function nope_test_Deletetion () { done } -function nope_test_deletion_failure () { +function test_deletion_failure () { if [ "$LOCAL_OS" == "WinNT10" ]; then echo "Skipping deletion failure test as Win10 does not have chattr support." return 0 @@ -421,7 +421,7 @@ function nope_test_deletion_failure () { done } -function nope_test_skip_deletion () { +function test_skip_deletion () { local modes if [ "$OSYNC_MIN_VERSION" == "1" ]; then @@ -492,7 +492,7 @@ function nope_test_skip_deletion () { SetConfFileValue "$CONF_DIR/$REMOTE_CONF" "SKIP_DELETION" "" } -function nope_test_softdeletion_cleanup () { +function test_softdeletion_cleanup () { #declare -A files files=() @@ -548,7 +548,7 @@ function nope_test_softdeletion_cleanup () { } -function nope_test_FileAttributePropagation () { +function test_FileAttributePropagation () { if [ "$TRAVIS_RUN" == true ]; then echo "Skipping FileAttributePropagation tests as travis does not support getfacl / setfacl." @@ -626,7 +626,7 @@ function nope_test_FileAttributePropagation () { done } -function nope_test_ConflictBackups () { +function test_ConflictBackups () { for i in "${osyncParameters[@]}"; do cd "$OSYNC_DIR" PrepareLocalDirs @@ -662,7 +662,7 @@ function nope_test_ConflictBackups () { done } -function nope_test_MultipleConflictBackups () { +function test_MultipleConflictBackups () { local additionalParameters @@ -722,7 +722,7 @@ function nope_test_MultipleConflictBackups () { SetConfFileValue "$CONF_DIR/$REMOTE_CONF" "CONFLICT_BACKUP_MULTIPLE" "no" } -function nope_test_Locking () { +function test_Locking () { local forceStrangerUnlockLocal local forceStrangerUnlockRemote @@ -841,7 +841,7 @@ function test_WaitForTaskCompletion () { if [ "$OSYNC_MIN_VERSION" == "1" ]; then echo "Using v1.1 WaitForTaskCompletion test" - # Needed in order to get PROCESS_nope_test_CMD value + # Needed in order to get PROCESS_test_CMD value InitLocalOSSettings # Standard wait @@ -925,7 +925,7 @@ function test_WaitForTaskCompletion () { assertEquals "WaitForTaskCompletion test 5" "2" $? } -function nope_test_ParallelExec () { +function test_ParallelExec () { if [ "$OSYNC_MIN_VERSION" == "1" ]; then echo "Skipping ParallelExec test because osync v1.1 ofunctions don't have this function." return 0 @@ -1034,7 +1034,7 @@ function test_timedExecution () { done } -function nope_test_UpgradeConfRun () { +function 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 @@ -1056,7 +1056,7 @@ function nope_test_UpgradeConfRun () { rm -f "$CONF_DIR/$TMP_OLD_CONF.save" } -function nope_test_DaemonMode () { +function test_DaemonMode () { if [ "$LOCAL_OS" == "WinNT10" ] || [ "$LOCAL_OS" == "msys" ]; then echo "Skipping daemon mode test as Win10 does not have inotifywait support." return 0 @@ -1111,7 +1111,7 @@ function nope_test_DaemonMode () { } -function nope_test_NoRemoteAccessTest () { +function test_NoRemoteAccessTest () { RemoveSSH cd "$OSYNC_DIR"