Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -r7c915408c5ea9f671cf72d1e97d2ac1c8b2c3901 -r0a30a581513ba4921a714c2153ad6729e6b2fa30 --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 7c915408c5ea9f671cf72d1e97d2ac1c8b2c3901) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 0a30a581513ba4921a714c2153ad6729e6b2fa30) @@ -53,7 +53,7 @@ BLUE_COLOR = "#18559e" ALARM_REJECT_NOTIFICATION_TEMPLATE = "No Active Alarm List [{}]" -ALARM_TREATMENT_BLOOD_STOP_COUNTDOWN_DESCRIPTION = "Rinseback will not be allowed in:" +ALARM_TREATMENT_BLOOD_STOP_COUNTDOWN_DESCRIPTION = "Return Blood will not be allowed in:" #HeaderBar WiFi WIFI_POPUP_TEXT = "WiFi Connection Error" Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r7c915408c5ea9f671cf72d1e97d2ac1c8b2c3901 -r0a30a581513ba4921a714c2153ad6729e6b2fa30 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 7c915408c5ea9f671cf72d1e97d2ac1c8b2c3901) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 0a30a581513ba4921a714c2153ad6729e6b2fa30) @@ -86,7 +86,7 @@ o_Alarm_Rinseback_Button = {"container": o_Overlay, "id": "_rinsebackTouchRect", "type": "TouchRect", "unnamed": 1 } o_Alarm_End_Treatment_Button = {"container": o_Overlay, "id": "_endTouchRect", "type": "TouchRect", "unnamed": 1 } o_Alarm_timerRect_Rectangle = {"container": o_Overlay, "id": "_timerRect", "type": "Rectangle", "unnamed": 1 } -o_Alarm_temporaryBreak_Button = {"container": o_Overlay, "type": "Text", "unnamed": 1 } +o_Alarm_temporaryBreak_Button = {"container": o_Overlay, "id": "_temporaryBreak", "type": "TouchRect", "unnamed": 1 } #ultrafiltration o_treatmentUltrafiltration = {"container": mainTreatmentScreen, "objectName": "treatmentUltrafiltration", "type": "TreatmentUltrafiltration" } Index: suite_leahi/tst_general_alarm_requirements_instruction/test.py =================================================================== diff -u -r0dc92661c3b8e321499fdfcc08ec20bb96676fb6 -r0a30a581513ba4921a714c2153ad6729e6b2fa30 --- suite_leahi/tst_general_alarm_requirements_instruction/test.py (.../test.py) (revision 0dc92661c3b8e321499fdfcc08ec20bb96676fb6) +++ suite_leahi/tst_general_alarm_requirements_instruction/test.py (.../test.py) (revision 0a30a581513ba4921a714c2153ad6729e6b2fa30) @@ -166,7 +166,6 @@ config.ALARMS_COLORS_HEADER[config.ALARM_PRIORITY_OPTIONS[alarm_priority]], "Comparison of Alarm Bar Color After Alarm minimized", ) - maximize() test.endSection() @@ -384,7 +383,7 @@ parent_container, config.ALARM_TREATMENT_BLOOD_STOP_COUNTDOWN_DESCRIPTION ) - test.compare( alarm_countdown_description.text, + test.compare(alarm_countdown_description.text, config.ALARM_TREATMENT_BLOOD_STOP_COUNTDOWN_DESCRIPTION, f"Comparison of Alarm Blood Stop Countdown Description Text", ) @@ -414,11 +413,11 @@ flag_status = alarm_flags["no_rinseback"] alarm.cmd_activate_alarm_id(1, 1, 0, flags=flag_status) - temporary_break_button = waitForObjectExists(names.o_Alarm_temporaryBreak_Button) + temporary_break_button = utility.get_object_from_names(names.o_Alarm_temporaryBreak_Button) if temporary_break_button.visible == True: mouseClick(temporary_break_button) test.compare( - waitForObjectExists(names.o_Alarm_temporaryBreak_Button, 2000).visible, + utility.get_object_from_names(names.o_Alarm_temporaryBreak_Button).visible, True, "Alarm Temporary Break Button visible", )