Index: tests/test_alarm_2.py =================================================================== diff -u --- tests/test_alarm_2.py (revision 0) +++ tests/test_alarm_2.py (revision b9fb7db20f9ac97da147afc08a18648347dc8d90) @@ -0,0 +1,16 @@ + + +import sys +sys.path.append("..") + +from dialin import HD, DG + + +hd = HD() +dg = DG() + +if (dg.cmd_log_in_to_dg()): + hd.alarms.cmd_alarm_state_override(0, 0, 0) + dg.temperature_sensors.cmd_temperature_sensors_override_value(0, 36, 0) + + Index: tests/test_alarms.py =================================================================== diff -u -rc864e886bc1b52d3a43f03c507425248c44a913f -rb9fb7db20f9ac97da147afc08a18648347dc8d90 --- tests/test_alarms.py (.../test_alarms.py) (revision c864e886bc1b52d3a43f03c507425248c44a913f) +++ tests/test_alarms.py (.../test_alarms.py) (revision b9fb7db20f9ac97da147afc08a18648347dc8d90) @@ -127,7 +127,12 @@ hd_sim.alarms_simulator.cmd_repeat_broadcast_alarm(alarm=AlarmList.ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK, state=1, timeout=20) +def test_activate_alarm(): + hd_sim = HDSimulator() + hd_sim.alarms_simulator.cmd_send_clear_alarms() + hd_sim.alarms_simulator.cmd_activate_alarm(alarm=AlarmList.ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK) if __name__ == '__main__': - test_repeated_alarm() + test_activate_alarm() + # test_repeated_alarm() Index: tests/test_gen_requirements.py =================================================================== diff -u -r8ea13ae6dd10732bfcc456798f4785c4d88c95d3 -rb9fb7db20f9ac97da147afc08a18648347dc8d90 --- tests/test_gen_requirements.py (.../test_gen_requirements.py) (revision 8ea13ae6dd10732bfcc456798f4785c4d88c95d3) +++ tests/test_gen_requirements.py (.../test_gen_requirements.py) (revision b9fb7db20f9ac97da147afc08a18648347dc8d90) @@ -83,16 +83,15 @@ return result -def generate_requirements(): + +def generate_hd_requirements(): """ - Generates requires for both HD and DG + Generates requires for the HD @return: None """ hd = HD() - result = {} - modules = [ hd.alarms, hd.buttons, @@ -109,10 +108,16 @@ gen_publish_requirements(modules) gen_cmd_requirements(modules) - dg = DG() - result = {} +def generate_dg_requirements(): + """ + Generates requires for the DG + @return: None + """ + + dg = DG() + modules = [ dg.hd_proxy, dg.load_cells, @@ -121,13 +126,15 @@ dg.valves, dg.ro_pump, dg.drain_pump, - # dg.heaters, - # dg.temperature_sensors + dg.heaters, + dg.temperature_sensors, + dg.conductivity_sensors ] gen_publish_requirements(modules) gen_cmd_requirements(modules) if __name__ == '__main__': - generate_requirements() + generate_dg_requirements() + generate_hd_requirements()