Index: tests/test_nelson_labs_disinfect.py =================================================================== diff -u -r5d46528dea60d95e18caada03ff8e328b52bbb38 -r32e628abcbbd3fd70866505d9f2836a6f732ef06 --- tests/test_nelson_labs_disinfect.py (.../test_nelson_labs_disinfect.py) (revision 5d46528dea60d95e18caada03ff8e328b52bbb38) +++ tests/test_nelson_labs_disinfect.py (.../test_nelson_labs_disinfect.py) (revision 32e628abcbbd3fd70866505d9f2836a6f732ef06) @@ -1,14 +1,14 @@ ########################################################################### # -# Copyright (c) 2023-2023 Diality Inc. - All Rights Reserved. +# Copyright (c) 2023-2024 Diality Inc. - All Rights Reserved. # # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. # # @file test_nelson_labs_disinfect.py # # @author (last) Dara Navaei -# @date (last) 05-Mar-2023 +# @date (last) 21-Jun-2023 # @author (original) Dara Navaei # @date (original) 03-Feb-2023 # @@ -63,13 +63,11 @@ info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, ' 'Cancellation_mode, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Current_rinse_count, {}, ' - 'Total_rinse_count, {}, UI_state, {}, Top_alarm, {}, ' + 'Total_rinse_count, {}, 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, - DGChemDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name, - hd.alarms.alarm_top)) + dg.chemical_disinfect.r2_level, dg.chemical_disinfect_flush.rinse_count, 0, hd.alarms.alarm_top)) return info @@ -320,8 +318,8 @@ #run_nelson_drain_samples() - run_nelson_heat_positive_control() + #run_nelson_heat_positive_control() - run_nelson_heat_disinfect() + #run_nelson_heat_disinfect() - #run_nelson_chem_disinfect() \ No newline at end of file + run_nelson_chem_disinfect() \ No newline at end of file