Index: shared/scripts/names.py =================================================================== diff -u -rb465db1ba597c4ec337caf73e1a862e82b19f8a8 -r53da790343ac7d1554b51465dbf1483d84772050 --- shared/scripts/names.py (.../names.py) (revision b465db1ba597c4ec337caf73e1a862e82b19f8a8) +++ shared/scripts/names.py (.../names.py) (revision 53da790343ac7d1554b51465dbf1483d84772050) @@ -35,12 +35,15 @@ # settings menu item o_settingsHome = {"container": o_QQuickView , "id": "_settingsHome" , "type": "ScreenItem", "unnamed": 1, "visible": True} o_settingsHome_background = {"container": o_settingsHome, "id": "_backgroundRect", "type": "Rectangle" , "unnamed": 1, "visible": True} +o_diagnostics = {"container": o_settingsHome, "id": "_item_diagnostics", "type": "SettingsItem", "visible": True} +o_diagnostics_ScreenItem = {"container": o_QQuickView, "id": "_diagnostics", "type": "ScreenItem", "unnamed": 1, "visible": True} # Modal Dialog o_modalDialog = {"container": o_Overlay , "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} # Power off -o_poweroffButton = {"container": o_settingsHome, "id": "_poweroffButton", "type": "TouchRect" , "unnamed": 1, "visible": True} +# o_poweroffButton = {"container": o_settingsHome, "id": "_poweroffButton", "type": "TouchRect" , "unnamed": 1, "visible": True} +o_poweroffButton = {"container": o_diagnostics_ScreenItem, "id": "_poweroffButton", "type": "TouchRect", "unnamed": 1, "visible": True} o_poweroff_shutdown = {"container": o_QQuickView , "id": "_shutdownRect" , "type": "TouchRect" , "unnamed": 1, "visible": True} o_poweroff_cancel = {"container": o_QQuickView , "id": "_cancelTouch" , "type": "TouchRect" , "unnamed": 1, "visible": True} o_poweroff_notification = {"container": o_Overlay , "id": "_titleText" , "type": "TitleText" , "unnamed": 1, "visible": True, "type": "Text", "text": "System is shutting down"} Index: tst_Alarm/test.py =================================================================== diff -u -rad6b08978df15722bc12a9ffab0be87b1c8da2ac -r53da790343ac7d1554b51465dbf1483d84772050 --- tst_Alarm/test.py (.../test.py) (revision ad6b08978df15722bc12a9ffab0be87b1c8da2ac) +++ tst_Alarm/test.py (.../test.py) (revision 53da790343ac7d1554b51465dbf1483d84772050) @@ -68,4 +68,5 @@ denaliMessages.sendUnknown_HD() denaliMessages.sendUnknown_DG() - utils.tstDone() \ No newline at end of file + utils.tstDone() + Index: tst_ServiceShutdown/test.py =================================================================== diff -u -rb795e6250294344ef7b0396bae4648fb2aa306b3 -r53da790343ac7d1554b51465dbf1483d84772050 --- tst_ServiceShutdown/test.py (.../test.py) (revision b795e6250294344ef7b0396bae4648fb2aa306b3) +++ tst_ServiceShutdown/test.py (.../test.py) (revision 53da790343ac7d1554b51465dbf1483d84772050) @@ -30,6 +30,7 @@ mouseClick (waitForObjectExists(names.o_mainMenu_settings)) utils.waitForGUI() test.compare(waitForObjectExists(names.o_settingsHome).visible, True, globals.SRSUI(vSRSUI)) + mouseClick(waitForObjectExists(names.o_diagnostics)) def gotoScreenNtest_Contains_TreatmentHome(vSRSUI=""): mouseClick (waitForObjectExists(names.o_mainMenu_treatment)) Index: tst_Treatment_Ultrafiltration/test.py =================================================================== diff -u -rb465db1ba597c4ec337caf73e1a862e82b19f8a8 -r53da790343ac7d1554b51465dbf1483d84772050 --- tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision b465db1ba597c4ec337caf73e1a862e82b19f8a8) +++ tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 53da790343ac7d1554b51465dbf1483d84772050) @@ -59,4 +59,4 @@ startNTestTreatmentUltrafiltration(minUF, maxUF) utils.tstDone() - + \ No newline at end of file