Index: tests/dg_tests.py =================================================================== diff -u -r8bc7a5336b8f69192918eafc465ee1094537f96d -rcdcedbbbbae8cbc38fb3eb667cd3b5969212c7d0 --- tests/dg_tests.py (.../dg_tests.py) (revision 8bc7a5336b8f69192918eafc465ee1094537f96d) +++ tests/dg_tests.py (.../dg_tests.py) (revision cdcedbbbbae8cbc38fb3eb667cd3b5969212c7d0) @@ -76,10 +76,10 @@ 'Cancellation_mode, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Current_rinse_count, {}, ' 'Total_rinse_count, {}, UI_state, {}, Top_alarm, {}, ' .format(state, overall_elapsed_time, state_elapsed_time, - dg.chemical_disinfect.chemical_disinfect_elapsed_time, + dg.chemical_disinfect.chemical_disinfect_target_time, ChemCancellationModes(dg.chemical_disinfect.cancellation_mode).name, dg.chemical_disinfect.r1_level, - dg.chemical_disinfect.r2_level, dg.chemical_disinfect_flush.rinse_count, 0, - #dg.chemical_disinfect_flush.target_rinse_count, + dg.chemical_disinfect.r2_level, dg.chemical_disinfect_flush.rinse_count, + dg.chemical_disinfect_flush.rinse_count, DGChemDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name, hd.alarms.alarm_top)) return info @@ -488,8 +488,10 @@ complete_counter = 1 address = os.path.join(os.getcwd(), "ro_permeate_sample.log") f = open(address, "w") - dg.hd_proxy.cmd_start_stop_dg_ro_permeate_sample() + #dg.hd_proxy.cmd_start_stop_dg_ro_permeate_sample() + dg.temperatures.cmd_temperatures_value_override(0, 49) + try: while True: ro_perm = get_ro_permeate_sample_mode_info() @@ -568,8 +570,10 @@ complete_counter = 1 f = open("/home/fw/projects/dialin/tests/chemical_disinfect.log", "w") #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect() - dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush() + #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush() + dg.test_configs.cmd_set_test_config(DGTestConfigOptions.TEST_CONFIG_MIX_WITH_WATER.value) + try: while True: @@ -731,9 +735,9 @@ # cmd_set_disinfect_ui_screen() - collect_treatment_data() + #collect_treatment_data() - #run_ro_permeate_sample() + run_ro_permeate_sample() #collect_hd_treatment()