Index: tst_treatment_blood_dialysateflow_rate/test.py =================================================================== diff -u -rbb9e57d42f2a6d0959591f10056d347e7a6c1ffc -rf68c9b8ff2927c5f0e059737a1af09f0c72dff09 --- tst_treatment_blood_dialysateflow_rate/test.py (.../test.py) (revision bb9e57d42f2a6d0959591f10056d347e7a6c1ffc) +++ tst_treatment_blood_dialysateflow_rate/test.py (.../test.py) (revision f68c9b8ff2927c5f0e059737a1af09f0c72dff09) @@ -20,14 +20,14 @@ BLOOD_DIALYSATE_TESTING_OPTION = { "OPTION_1" : [0, 0, 0, 0, 0, 0, 0, 0, 'None'], - "OPTION_2" : [100, 1, 1, 1, 1, 1, 1, 1, 'blood'], - "OPTION_3" : [125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 'blood'], - "OPTION_4" : [550, 24, 32, 425, 85, 18, 36, 45, 'blood'], + "OPTION_2" : [100, 1, 1, 1, 1, 1, 1, 1, 1, 'blood'], + "OPTION_3" : [125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 125, 'blood'], + "OPTION_4" : [550, 24, 32, 425, 85, 18, 36, 45,'blood'], "OPTION_5" : [80, 12, 12, 12, 12, 12, 12, 12, 'blood'], "OPTION_6" : [100, 0, 0, 0, 0, 0, 0, 0, 'dialysate'], "OPTION_7" : [180, 1, 1, 1, 1, 1, 1, 1, 'dialysate'], - "OPTION_8" : [220, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45, 'blood'], - "OPTION_9" : [250, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45, 'dialysate'], + "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'], } hd_simulator = HDSimulator() @@ -148,17 +148,17 @@ mc_speed = blood_dialysate_control_list[4] mc_current = blood_dialysate_control_list[5] pwm = blood_dialysate_control_list[6] - signal_strength = blood_dialysate_control_list[7] + rot_count = blood_dialysate_control_list[7] flow_type = blood_dialysate_control_list[8] if flow_type == config.BLOOD_FLOW_TEXT: hd_simulator.cmd_set_treatment_blood_flow_rate(flow_set_pt, measured_flow, rot_speed, mot_speed, mc_speed, - mc_current, pwm, signal_strength) + mc_current, pwm, rot_count) test.compare(str(waitForObjectExists(names.o_treatment_blood_flow_rate).label), str(flow_set_pt)) elif flow_type == config.DIALYSATE_FLOW_TEXT: hd_simulator.cmd_set_treatment_dialysate_flow_rate(flow_set_pt, measured_flow, - rot_speed, mot_speed, mc_speed, mc_current, pwm, signal_strength) + rot_speed, mot_speed, mc_speed, mc_current, pwm) test.compare(str(waitForObjectExists(names.o_treatment_dialysate_flow_rate).label), str(flow_set_pt)) else :