Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/bareos/bareos.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlaa Eddine Elamri <alaeddine.elamri@bareos.com>2022-09-20 10:37:34 +0300
committerPhilipp Storz <philipp.storz@bareos.com>2022-10-25 14:13:49 +0300
commitc047c55a8f3e48298e8373ac3373bcb61cfcea02 (patch)
tree14e8d0a38cc48e646d0cd6eda56430ea38889881 /systemtests
parent6f864067150272d93951392a09ce54d2c76b7fe7 (diff)
systemtests: remove serial running from checkpoint test
Diffstat (limited to 'systemtests')
-rw-r--r--systemtests/tests/checkpoints/CMakeLists.txt9
-rwxr-xr-xsystemtests/tests/checkpoints/testrunner-checkpoints-on-cancel2
2 files changed, 1 insertions, 10 deletions
diff --git a/systemtests/tests/checkpoints/CMakeLists.txt b/systemtests/tests/checkpoints/CMakeLists.txt
index 6cd046c40..47970a2ef 100644
--- a/systemtests/tests/checkpoints/CMakeLists.txt
+++ b/systemtests/tests/checkpoints/CMakeLists.txt
@@ -19,12 +19,3 @@
get_filename_component(BASENAME ${CMAKE_CURRENT_BINARY_DIR} NAME)
create_systemtest(${SYSTEMTEST_PREFIX} ${BASENAME})
-
-set_tests_properties(
- "${SYSTEMTEST_PREFIX}${BASENAME}:checkpoints-on-stop" PROPERTIES RUN_SERIAL
- TRUE
-)
-set_tests_properties(
- "${SYSTEMTEST_PREFIX}${BASENAME}:checkpoints-on-kill" PROPERTIES RUN_SERIAL
- TRUE
-)
diff --git a/systemtests/tests/checkpoints/testrunner-checkpoints-on-cancel b/systemtests/tests/checkpoints/testrunner-checkpoints-on-cancel
index 433337c5c..a80b43d02 100755
--- a/systemtests/tests/checkpoints/testrunner-checkpoints-on-cancel
+++ b/systemtests/tests/checkpoints/testrunner-checkpoints-on-cancel
@@ -88,7 +88,7 @@ if [ $NumberOfBackedUpFiles -le 0 ]; then
fi
# Check that the restore of a canceled backup works fine
-expect_grep "Termination: Restore OK" \
+expect_grep "Termination:.*Restore OK" \
"$restore_log" \
"Restore is not OK."