From e41b48ed2e050b7af29d27df0ccef2884aa32bb0 Mon Sep 17 00:00:00 2001 From: deajan Date: Tue, 15 Nov 2016 23:20:20 +0100 Subject: [PATCH] Disabled some tests on v1.1x --- dev/tests/run_tests.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh index d3ed976..a939dc4 100755 --- a/dev/tests/run_tests.sh +++ b/dev/tests/run_tests.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# osync test suite 2016111504 +# osync test suite 2016111505 # 4 tests: # quicklocal @@ -577,6 +577,11 @@ function test_MultipleConflictBackups () { function test_WaitForTaskCompletion () { + if [ "$OSYNC_MIN_VERSION" != "1" ]; then + echo "Skipping WaitForTaskCompletion test because osync v1.1 does not support multiple pid monitoring" + return 0 + fi + local pids # Tests if wait for task completion works correctly @@ -627,8 +632,15 @@ function test_WaitForTaskCompletion () { } function test_ParallelExec () { + if [ "$OSYNC_MIN_VERSION" != "1" ]; then + echo "Skipping ParallelExec test because osync v1.1 didn't have this" + return 0 + fi + local cmd + + # Test if parallelExec works correctly in array mode cmd="sleep 2;sleep 2;sleep 2;sleep 2" @@ -669,6 +681,10 @@ function test_ParallelExec () { } 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 + fi # Basic return code tests. Need to go deep into file presence testing cd "$OSYNC_DIR"