Index: shared/scripts/configuration/config.py =================================================================== diff -u -re17ea2125be849d4e514f87e0f2e6f0701aa0a99 -rf4171975166332d9b42ba0a994fa6859362d9455 --- shared/scripts/configuration/config.py (.../config.py) (revision e17ea2125be849d4e514f87e0f2e6f0701aa0a99) +++ shared/scripts/configuration/config.py (.../config.py) (revision f4171975166332d9b42ba0a994fa6859362d9455) @@ -27,9 +27,6 @@ "Magenta":"#fd28fd", "Orange": "#f2721c", "Peach":"#f1979a", "Red": "#c53b33", "Rose":"#fc178d", "Slate blue":"#7f7ffa", "Violet": "#6435c9", "White": "#ffffff", "Yellow": "#fcfc4d"} -#standby mode -GOODMORNING_START_TIME_SEC = 0 -GOODEVENING_START_TIME_SEC = 43200 NUM_OF_REQUEST_REJECT_REASONS = 43 @@ -47,5 +44,3 @@ - - Index: shared/scripts/configuration/strings.py =================================================================== diff -u -re17ea2125be849d4e514f87e0f2e6f0701aa0a99 -rf4171975166332d9b42ba0a994fa6859362d9455 --- shared/scripts/configuration/strings.py (.../strings.py) (revision e17ea2125be849d4e514f87e0f2e6f0701aa0a99) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision f4171975166332d9b42ba0a994fa6859362d9455) @@ -17,7 +17,6 @@ #bloodflow dialysate BLOOD_PRIMING_TEXT = "Blood Priming" SALINE_UNIT = "mL" -BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" FLOW_UNIT = "mL/min" BLOOD_FLOW_TEXT = "blood" @@ -71,3 +70,7 @@ 42: "REQUEST_REJECT_REASON_DOOR_NOT_CLOSED", # Door is not closed 43: "REQUEST_REJECT_REASON_SYRINGE_NOT_PRESENT", # Syringe is not present } + +BLOOD_PRIMING_UNIT = "mL" +BLOOD_PRIMING_VALUE_0 = "0" +BLOOD_PRIMING_DEFAULT_VALUE = BLOOD_PRIMING_VALUE_0 + " " + BLOOD_PRIMING_UNIT Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r77b5308229d2f8cef5886d6f8f14fa89ff51a63b -rf4171975166332d9b42ba0a994fa6859362d9455 --- shared/scripts/configuration/utility.py (.../utility.py) (revision 77b5308229d2f8cef5886d6f8f14fa89ff51a63b) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision f4171975166332d9b42ba0a994fa6859362d9455) @@ -12,12 +12,7 @@ # ############################################################################ - -import sys -import test import squish -from configuration import config -from builtins import int as pyInt def check_if_object_is_within_the_container(obj=None, container=None): """ @@ -67,5 +62,4 @@ squish.mouseWheel(ScreenObj, screenWidth-1000, screenHeight-10, 0, -50, squish.Qt.NoModifier) - raise LookupError("zone object is not in view to the user after " + \ - "trying 100 times") + raise LookupError("zone object is not in view to the user after trying 100 times") Index: tst_treatment_blood_dialysateflow_rate/test.py =================================================================== diff -u -r5d1079d6e032927c8d4f60a4c31186b0df62447f -rf4171975166332d9b42ba0a994fa6859362d9455 --- tst_treatment_blood_dialysateflow_rate/test.py (.../test.py) (revision 5d1079d6e032927c8d4f60a4c31186b0df62447f) +++ tst_treatment_blood_dialysateflow_rate/test.py (.../test.py) (revision f4171975166332d9b42ba0a994fa6859362d9455) @@ -29,7 +29,7 @@ "OPTION_8" : [220, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45, 145, 'blood'], "OPTION_9" : [250, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45, 145, 'dialysate'], } - + DUMMY_INTIGER = 12 #This value is used for arguments which is not part of verification hd_simulator = HDSimulator() @@ -197,8 +197,7 @@ @param signal_strength: (float) blood_dialysate_control_list[8] @param flow_type: (str) blood_dialysate_control_list[9] """ - test.startSection("verification of blood flow range and dialysate range on " + \ - "main treatment screen") + test.startSection("verification of blood flow range and dialysate range on main treatment screen") flow_set_pt = blood_dialysate_control_list[0] measured_flow = blood_dialysate_control_list[1] rot_speed = blood_dialysate_control_list[2] @@ -237,7 +236,7 @@ hd_simulator.cmd_set_treatment_states_data(sub_mode= 2, uf_state= 0, saline_state=1, heparin_state= 0, rinseback_state= 0, recirculate_state= 0, blood_prime_state= 2, treatment_end_state=0, treatment_stop_state= 0, dialysis_state=0) - utils.waitForGUI() #delay for fetching effect + utils.waitForGUI(1) #delay for fetching effect test_blood_flow_rate_and_dialysate(BLOOD_DIALYSATE_FLOW_TESTING_OPTION["OPTION_1"]) test_blood_flow_rate_and_dialysate(BLOOD_DIALYSATE_FLOW_TESTING_OPTION["OPTION_2"])