Index: suite_leahi/tst_feature_options/test.py =================================================================== diff -u -r0e42fef3902aedac04bbe9ed571efd4ff9b399f0 -r7c733fe651013ae4a2ee2355977ae63b9cf3596e --- suite_leahi/tst_feature_options/test.py (.../test.py) (revision 0e42fef3902aedac04bbe9ed571efd4ff9b399f0) +++ suite_leahi/tst_feature_options/test.py (.../test.py) (revision 7c733fe651013ae4a2ee2355977ae63b9cf3596e) @@ -36,8 +36,7 @@ settings_menu_object = utility.findChildByText(main_menu_container, "Treatment") if settings_menu_object is not None: mouseClick(settings_menu_object) - td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value, 0) - + mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect, 3000)) td_simulator.td_operation_mode(TDOpModes.MODE_TREA.value, 0) @@ -121,12 +120,14 @@ ) mouseClick(waitForObject(names.o_SettingsFeatureConfigurations_BackButton, 2000)) + main_menu_container = waitForObject(names.o_mainMenu_MainMenu, 2000) prescriptions_menu_object = utility.findChildByText( main_menu_container, "Prescriptions" ) if prescriptions_menu_object is not None: mouseClick(prescriptions_menu_object) + td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value) navigate_to_main_treatment_screen_from_settings() mouseClick(waitForObjectExists(names.o_vitalsButton_VitalsButton, 2000)) @@ -176,6 +177,7 @@ ) if prescriptions_menu_object is not None: mouseClick(prescriptions_menu_object) + navigate_to_main_treatment_screen_from_settings() mouseClick(waitForObjectExists(names.o_vitalsButton_VitalsButton, 2000)) @@ -230,6 +232,7 @@ ) mouseClick(waitForObject(names.o_SettingsFeatureConfigurations_BackButton, 2000)) + main_menu_container = waitForObject(names.o_mainMenu_MainMenu, 2000) prescriptions_menu_object = utility.findChildByText( main_menu_container, "Prescriptions" @@ -242,7 +245,6 @@ if settings_menu_object is not None: mouseClick(settings_menu_object) - td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value, 0) mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect, 2000)) td_simulator.td_operation_mode(TDOpModes.MODE_PRET.value) navigation.navigation_pageIndicator_step(config.CREATERX) @@ -313,6 +315,7 @@ ) mouseClick(waitForObject(names.o_SettingsFeatureConfigurations_BackButton, 2000)) + main_menu_container = waitForObject(names.o_mainMenu_MainMenu, 2000) prescriptions_menu_object = utility.findChildByText( main_menu_container, "Prescriptions" @@ -325,7 +328,6 @@ if settings_menu_object is not None: mouseClick(settings_menu_object) - td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value, 0) mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect, 2000)) td_simulator.td_operation_mode(TDOpModes.MODE_PRET.value) navigation.navigation_pageIndicator_step(config.CREATERX)