Index: tests/test_nelson_labs_disinfect.py =================================================================== diff -u -r821d2c94ccc6542a7733a9453e59b751bfd0ef75 -r0cf6faaa1773d0f95a08db43cf3b47aef7749eaa --- tests/test_nelson_labs_disinfect.py (.../test_nelson_labs_disinfect.py) (revision 821d2c94ccc6542a7733a9453e59b751bfd0ef75) +++ tests/test_nelson_labs_disinfect.py (.../test_nelson_labs_disinfect.py) (revision 0cf6faaa1773d0f95a08db43cf3b47aef7749eaa) @@ -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