Merge pull request #328 from joergsteffens/dev/joergs/master/webui-se…

…lenium webui: improve selenium test
bareos · Nov 28, 2019 · e711dc7 · e711dc7
2 parents b2f24cb + b9ee242
commit e711dc7
Show file tree

Hide file tree

Showing 2 changed files with 158 additions and 53 deletions.
diff --git a/systemtests/tests/webui-common/testrunner.in b/systemtests/tests/webui-common/testrunner.in
@@ -40,18 +40,21 @@ run_bareos
 
 PHP_PID=$(echo $!)
 
-# run tests but stop the test run on the first error or failure
+# run tests
 
 #
 # test with admin profile resource
 #
 export BAREOS_WEBUI_PROFILE=@BAREOS_WEBUI_PROFILE@
 export BAREOS_WEBUI_TESTNAME=@BAREOS_WEBUI_TESTNAME@
 echo "test with ${BAREOS_WEBUI_PROFILE} profile:" >"$tmp/selenium.out" 2>&1
-@PYTHON@ @CMAKE_SOURCE_DIR@/webui/tests/selenium/webui-selenium-test.py -v "SeleniumTest.test_${BAREOS_WEBUI_TESTNAME}" | tee "$tmp/selenium.out" 2>&1
+# WRONG: false | tee /tmp/tmp.txt has always $? == 0.
+#@PYTHON@ @CMAKE_SOURCE_DIR@/webui/tests/selenium/webui-selenium-test.py -v "SeleniumTest.test_${BAREOS_WEBUI_TESTNAME}" | tee "$tmp/selenium.out" 2>&1
+if ! @PYTHON@ @CMAKE_SOURCE_DIR@/webui/tests/selenium/webui-selenium-test.py -v "SeleniumTest.test_${BAREOS_WEBUI_TESTNAME}" >>"$tmp/selenium.out" 2>&1; then
 
-estat=$?
-export estat
+    set_error "$(cat "$tmp/selenium.out")"
+
+fi
 
 kill "${PHP_PID}"