fix existing tests

log0div0 · Apr 10, 2022 · 73075ae · 73075ae
1 parent 95976f3
commit 73075ae
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/ci/test_scripts/centos_backend_qemu.testo b/ci/test_scripts/centos_backend_qemu.testo
@@ -62,9 +62,9 @@ test centos_backend_qemu_stop_offline_machine_nested: centos_install_testo {
 		copyto "${TEST_ASSETS_DIR}/backend/action_start_stop.testo" "/opt/scripts/action_start_stop.testo"
 
 		exec bash """
-			set +o pipefail
 			set +e
 			output=$(testo run /opt/scripts/action_start_stop.testo --stop_on_fail --test_spec stop_offline_machine_nested)
+			set -e
 
 			[[ $output == *"In a macro call my_macro"* ]]
 			[[ $output == *"Error while performing action stop on virtual machine my_ubuntu_server2"* ]]
@@ -213,33 +213,33 @@ test centos_backend_qemu_wait: centos_install_testo {
 		copyto "${TEST_ASSETS_DIR}/backend/action_wait.testo" "/opt/scripts/action_wait.testo"
 
 		exec bash """
-			set +o pipefail
 			set +e
 			output=$(testo run /opt/scripts/action_wait.testo --stop_on_fail --test_spec wait_expr_bug_0)
+			set -e
 			[[ $output == *"Error while performing action wait !\\\"Unexisting text\\\""* ]]
 			[[ $output == *"Timeout"* ]]
 		"""
 
 		exec bash """
-			set +o pipefail
 			set +e
 			output=$(testo run /opt/scripts/action_wait.testo --stop_on_fail --test_spec wait_expr_bug_1)
-			[[ $output == *"Error while performing action wait !\\\"Unexisting text\\\""* ]]
+			set -e
+			[[ $output == *"Error while performing action wait !(!\\\"Unexisting text\\\""* ]]
 			[[ $output == *"Timeout"* ]]
 		"""
 
 		exec bash """
-			set +o pipefail
 			set +e
 			output=$(testo run /opt/scripts/action_wait.testo --stop_on_fail --test_spec wait_expr_bug_2)
+			set -e
 			[[ $output == *"Error while performing action wait !\\\"Lala\\\""* ]]
 			[[ $output == *"Timeout"* ]]
 		"""
 
 		exec bash """
-			set +o pipefail
 			set +e
 			output=$(testo run /opt/scripts/action_wait.testo --stop_on_fail --test_spec wait_js_print)
+			set -e
 			[[ $output == *"Hello world!"* ]]
 		"""
 	}
@@ -252,9 +252,9 @@ test centos_backend_qemu_mouse: centos_install_testo {
 		copyto "${TEST_ASSETS_DIR}/backend/action_mouse.testo" "/opt/scripts/action_mouse.testo"
 
 		exec bash """
-			set +o pipefail
 			set +e
 			output=$(testo run /opt/scripts/action_mouse.testo --stop_on_fail --test_spec mouse_js_print)
+			set -e
 			[[ $output == *"Hello world!"* ]]
 		"""
 	}

diff --git a/ci/test_scripts/centos_backend_qemu_flash.testo b/ci/test_scripts/centos_backend_qemu_flash.testo
@@ -134,9 +134,9 @@ test centos_backend_qemu_flash_copyto_from_not_exist_runtime: centos_backend_qem
 		copyto "${TEST_ASSETS_DIR}/backend/action_flash.testo" "/opt/scripts/action_flash.testo"
 
 		exec bash """
-			set +o pipefail
 			set +e
 			output=$(testo run /opt/scripts/action_flash.testo --test_spec flash_copyto_from_doesnt_exist_runtime)
+			set -e
 			[[ $output == *"Preparing the environment for test flash_copyto_from_doesnt_exist_runtime"* ]]
 			[[ $output == *"Specified path doesn't exist: /tmp/lala.log"* ]]
 		"""
@@ -174,9 +174,9 @@ test centos_backend_qemu_flash_copyto_timeout: centos_backend_qemu_install_guest
 		"""
 
 		exec bash """
-			set +o pipefail
 			set +e
 			output=$(testo run /opt/scripts/action_flash.testo --stop_on_fail --test_spec flash_copyto_timeout)
+			set -e
 			[[ $output == *"Error while performing action copyto"* ]]
 			[[ $output == *"Timeout was triggered"* ]]
 		""" timeout 30m

diff --git a/ci/test_scripts/centos_backend_qemu_ga.testo b/ci/test_scripts/centos_backend_qemu_ga.testo
@@ -6,9 +6,9 @@ test centos_backend_qemu_exec_timeout: centos_backend_qemu_install_guest_additio
 		copyto "${TEST_ASSETS_DIR}/backend/action_ga.testo" "/opt/scripts/action_ga.testo"
 
 		exec bash """
-			set +o pipefail
 			set +e
 			output=$(testo run /opt/scripts/action_ga.testo --stop_on_fail --test_spec exec_timeout)
+			set -e
 			[[ $output == *"Error while performing action exec bash"* ]]
 			[[ $output == *"Timeout was triggered"* ]]
 		""" timeout 30m
@@ -22,9 +22,9 @@ test centos_backend_qemu_copyto_from_doesnt_exist_runtime: centos_backend_qemu_i
 		copyto "${TEST_ASSETS_DIR}/backend/action_ga.testo" "/opt/scripts/action_ga.testo"
 
 		exec bash """
-			set +o pipefail
 			set +e
 			output=$(testo run /opt/scripts/action_ga.testo --stop_on_fail --test_spec copyto_from_unexisting_runtime)
+			set -e
 			[[ $output == *"Preparing the environment for test copyto_from_unexisting_runtime"* ]]
 			[[ $output == *"Specified path doesn't exist: /some/unexisting_shit"* ]]
 		""" timeout 30m