Index: suite_leahi/tst_main_treatment/test.py =================================================================== diff -u -rd5b09ce1c343318a5ca04fe9de4e8b396563eec4 -rc45dbc6cca70c0af6a8ac7e3815955a20128ad9e --- suite_leahi/tst_main_treatment/test.py (.../test.py) (revision d5b09ce1c343318a5ca04fe9de4e8b396563eec4) +++ suite_leahi/tst_main_treatment/test.py (.../test.py) (revision c45dbc6cca70c0af6a8ac7e3815955a20128ad9e) @@ -261,11 +261,11 @@ #TX Parameter set points def verify_setPoints_from_main_treatement(): TREATMENT_PARAMETER_SETPOINTS_TD_TEST_VALUES = [ - {"blood flow": 56, "dial flow": 22, "dial tmp": 20.0, "dial cond": 34.0 }, - {"blood flow": 99, "dial flow": 78, "dial tmp": 87.0, "dial cond": 55.0 }, - {"blood flow": 34, "dial flow": 99, "dial tmp": 99.0, "dial cond": 99.0 }, - {"blood flow": 100, "dial flow": 100,"dial tmp": 100.0,"dial cond": 100.0}, - {"blood flow": 110, "dial flow": 110,"dial tmp": 110.0,"dial cond": 110.0} + {"blood flow": 56, "dial flow": 22, "dial tmp": 20.0, "dial cond": 100.0 }, + {"blood flow": 99, "dial flow": 78, "dial tmp": 87.0, "dial cond": 200.0 }, + {"blood flow": 34, "dial flow": 99, "dial tmp": 99.0, "dial cond": 300.0 }, + {"blood flow": 100, "dial flow": 100,"dial tmp": 100.0,"dial cond": 400.0}, + {"blood flow": 110, "dial flow": 110,"dial tmp": 110.0,"dial cond": 500.0} ] #Verify the title values in the set points @@ -299,14 +299,14 @@ test.compare(str(dialTmp_properties["value"]), str(target_dial_tmp), "Dialyste Tmp value should be :" + str(target_dial_tmp)) dd.dd_conductivity(D17 = 0, - D27 = 0, - D29 = target_dial_cond, + D27 = target_dial_cond, + D29 = 0, D43 = 0, D74 = 0) dialCond = utility.get_object_from_names(names.o_dial_cond_value) dialCond_properties = object.properties(dialCond) - test.compare(str(dialCond_properties["value"]), str(target_dial_cond), "Dialyste conductivity value should be :" + str(target_dial_cond)) + test.compare(round(float(dialCond_properties["value"]),1), round(float(target_dial_cond/1000),1), "Dialyste conductivity value should be :" + str(target_dial_cond)) test.endSection() def edit_treatment_duration():