Index: tst_pre_treatment_priming/test.py =================================================================== diff -u -rc79559a8ecd6dc676c7aed956ba1a5d1e45534a0 -re8535a7e3c30daad306221dd3d0c822f6994d503 --- tst_pre_treatment_priming/test.py (.../test.py) (revision c79559a8ecd6dc676c7aed956ba1a5d1e45534a0) +++ tst_pre_treatment_priming/test.py (.../test.py) (revision e8535a7e3c30daad306221dd3d0c822f6994d503) @@ -176,18 +176,16 @@ test.startSection("Passing {} state".format(state)) hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_PRIME_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_HOME_IDLE_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, - prime_state=index,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE.value, + prime_state=index, + recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE.value, wet_selftests_state = PreTreatmentWetSelfTestStates.WET_SELF_TESTS_START_STATE.value, pretreatment_rsrvr_state = HDPreTreatmentReservoirMgmtStates.PRE_TREATMENT_RESERVOIR_MGMT_START_STATE.value) - if (state == "HD_PRIME_START_STATE") or (state == "HD_PRIME_WAIT_FOR_USER_START_STATE") : + if (state == "HD_PRIME_START_STATE") or (state == "HD_PRIME_WAIT_FOR_USER_START_STATE"): verify_indicators(None, config.PRIMING_STEPS) if state == "HD_PRIME_WAIT_FOR_USER_START_STATE": verify_start_priming_button(config.ENABLED) hd_simulator.cmd_send_pre_treatment_prime_start_response(config.ACCEPTED, 0) - else: - verify_start_priming_button(config.DISABLED) - verify_continue_button(config.DISABLED) elif (state == "HD_PRIME_SALINE_SETUP_STATE") or (state == "HD_PRIME_SALINE_PURGE_AIR_STATE") or (state == "HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE"): verify_indicators(config.BUSY, "Blood Circuit Priming") verify_start_priming_button(config.DISABLED) @@ -245,7 +243,6 @@ else: for step in steps: busy_indicator, check_indicator = get_indicators(step) - test.compare(busy_indicator.visible, config.NOT_VISIBLE, "No indicator should display next to the {}".format(step)) test.compare(check_indicator.visible, config.NOT_VISIBLE, "No indicator should display next to the {}".format(step)) test.endSection() @@ -333,4 +330,4 @@ utils.tstDone() - \ No newline at end of file +