Index: shared/scripts/configuration/config.py =================================================================== diff -u -r5fcc16659c7f67c7ea04663a141273f6c0058fa5 -r33f5a5e0045358b923c621445d2f1cc1d2bd83c4 --- shared/scripts/configuration/config.py (.../config.py) (revision 5fcc16659c7f67c7ea04663a141273f6c0058fa5) +++ shared/scripts/configuration/config.py (.../config.py) (revision 33f5a5e0045358b923c621445d2f1cc1d2bd83c4) @@ -16,7 +16,7 @@ import os from configuration.strings import * -AUT_NAME = "denaliSquish" +AUT_NAME = "denaliSquish -k -K -S" COMMON_PATH = os.environ['HOME']+"/Projects" Index: shared/scripts/names.py =================================================================== diff -u -re9dd07363fb7d61e4c4303dde2eb495d92e0d197 -r33f5a5e0045358b923c621445d2f1cc1d2bd83c4 --- shared/scripts/names.py (.../names.py) (revision e9dd07363fb7d61e4c4303dde2eb495d92e0d197) +++ shared/scripts/names.py (.../names.py) (revision 33f5a5e0045358b923c621445d2f1cc1d2bd83c4) @@ -63,7 +63,10 @@ o_self_test_dry_progress_circle = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "id": "_progressCircle", "type": "ProgressCircle", "unnamed": 1, "visible": True} #start prime button and continue button o_start_prime_btn = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "text": "Start Prime", "type": "Text", "unnamed": 1, "visible": True} +o_pretreatmentPrimeStack_preTreatmentDisposablesPrime_TreatmentFlowBase = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "objectName": "_preTreatmentDisposablesPrime", "type": "TreatmentFlowBase", "visible": True} +o_preTreatmentDisposablesPrime_startPrimeButton_TouchRect = {"container": o_pretreatmentPrimeStack_preTreatmentDisposablesPrime_TreatmentFlowBase, "id": "_startPrimeButton", "type": "TouchRect", "unnamed": 1, "visible": True} o_continue_btn = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "text": "CONTINUE", "type": "Text", "unnamed": 1, "visible": True} +o_preTreatmentDisposablesPrime_confirmButton_TouchRect = {"container": o_pretreatmentPrimeStack_preTreatmentDisposablesPrime_TreatmentFlowBase, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} #text and bullet object o_text_object = {"type": "Text", "unnamed": 1, "visible": True} o_bullet_object = {"type": "StepBullet", "unnamed": 1, "visible": True} Index: tst_pre_treatment_priming/test.py =================================================================== diff -u -r0150cf7dd45582ddc64bec281fdccc719f2980af -r33f5a5e0045358b923c621445d2f1cc1d2bd83c4 --- tst_pre_treatment_priming/test.py (.../test.py) (revision 0150cf7dd45582ddc64bec281fdccc719f2980af) +++ tst_pre_treatment_priming/test.py (.../test.py) (revision 33f5a5e0045358b923c621445d2f1cc1d2bd83c4) @@ -137,7 +137,7 @@ verify_indicators(config.BUSY, "Wet Self Tests") verify_completion_message_and_indicator(True, config.PRIMING_COMPLETE_MSG) verify_continue_button(config.ENABLED) - mouseClick(waitForObjectExists(names.o_continue_btn)) + mouseClick(waitForObjectExists(names.o_preTreatmentDisposablesPrime_confirmButton_TouchRect)) hd_simulator.cmd_send_hd_general_response(101, config.ACCEPTED, 0) test.endSection() test.endSection() @@ -258,7 +258,7 @@ start_prime_btn = waitForObjectExists(names.o_start_prime_btn) if expected_state: test.compare(start_prime_btn.enabled, config.ENABLED, "'Start Prime' should be enabled") - mouseClick(start_prime_btn) + mouseClick(waitForObjectExists(names.o_preTreatmentDisposablesPrime_startPrimeButton_TouchRect)) else: test.compare(start_prime_btn.enabled, config.DISABLED, "'Start Prime' should be disabled") test.endSection()