Index: tst_Alarm_Colors/test.py =================================================================== diff -u -rac88b33834b21228e3dd2764b5fa6ff13cbababe -r4b28ff7783e97be695b5d942b9eaf17d95347434 --- tst_Alarm_Colors/test.py (.../test.py) (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) +++ tst_Alarm_Colors/test.py (.../test.py) (revision 4b28ff7783e97be695b5d942b9eaf17d95347434) @@ -111,18 +111,13 @@ #test.log("Testing {0} = {1}".format(alarm_list[idx], alarm_id)) color = HIGH_PRIORITY_COLOR if priority == HIGH else MED_LOW_PRIORITY_COLOR denaliMessages.setAlarmStatus(priority, alarm_id, escalates_in, silent_expires_in, flags) - test.compare(waitForObjectExists(names.o_alarm_dialog).color.name, color) - mouseClick(waitForObjectExists(names.o_dismiss_alarm)) - sleep(0.20) - mouseClick(waitForObjectExists(names.o_alarm_bar)) - sleep(0.20) - mouseClick(waitForObjectExists(names.o_dismiss_alarm)) - sleep(0.20) - mouseClick(waitForObjectExists(names.o_alarm_bar)) - sleep(0.20) - mouseClick(waitForObjectExists(names.o_okay_alarm)) - sleep(0.20) - mouseClick(waitForObjectExists(names.o_alarm_bar)) + test.compare(waitForObject(names.o_alarm_dialog).color.name, color) + mouseClick(waitForObject(names.o_dismiss_alarm)) + mouseClick(waitForObject(names.o_alarm_bar)) + mouseClick(waitForObject(names.o_dismiss_alarm)) + mouseClick(waitForObject(names.o_alarm_bar)) + mouseClick(waitForObject(names.o_okay_alarm)) + mouseClick(waitForObject(names.o_alarm_bar)) denaliMessages.clear_all_alarms() def test_alarm_acknowledge(alarms): @@ -134,19 +129,11 @@ #test.log("Testing alarm acknowledgement") denaliMessages.clear_all_alarms() - sleep(0.5) - - denaliMessages.setAlarmStatus(*alarms.ALARM_ID_SOFTWARE_FAULT) - sleep(0.5) - test.compare(waitForObjectExists(names.o_alarm_dialog).color.name, HIGH_PRIORITY_COLOR) - sleep(0.5) - mouseClick(waitForObjectExists(names.o_okay_alarm)) - sleep(0.5) + test.compare(waitForObject(names.o_alarm_dialog).color.name, HIGH_PRIORITY_COLOR) + mouseClick(waitForObject(names.o_okay_alarm)) denaliMessages.clear_all_alarms() - sleep(0.5) denaliMessages.setAlarmStatus(*alarms.ALARM_ID_SOFTWARE_FAULT) - sleep(0.5) def get_alarm_list(alarms): @@ -173,7 +160,6 @@ utils.tstStart(__file__) startApplication(names.AUT_NAME + " -q") - sleep(0.5) alarms = Alarms() alarm_list = get_alarm_list(alarms) @@ -187,7 +173,6 @@ sleep(3) startApplication(names.AUT_NAME) - sleep(0.5) alarm_list = [alarms.ALARM_ID_HD_COMM_TIMEOUT] # test hd comm timeout since it was skipped in the last test