updated runner structure so that handlers and conductors actually pull from queues in the runner. changes to logic in both are extensive, but most individual functinos are unaffected. I've also moved several functions that were part of individual monitor, handler and conductors to the base classes.
This commit is contained in:
@ -227,7 +227,7 @@ class WatchdogMonitorTests(unittest.TestCase):
|
||||
}
|
||||
|
||||
wm = WatchdogMonitor(TEST_MONITOR_BASE, patterns, recipes)
|
||||
wm.to_runner = from_monitor_writer
|
||||
wm.to_runner_event = from_monitor_writer
|
||||
|
||||
rules = wm.get_rules()
|
||||
|
||||
@ -291,7 +291,7 @@ class WatchdogMonitorTests(unittest.TestCase):
|
||||
rule = rules[list(rules.keys())[0]]
|
||||
|
||||
from_monitor_reader, from_monitor_writer = Pipe()
|
||||
wm.to_runner = from_monitor_writer
|
||||
wm.to_runner_event = from_monitor_writer
|
||||
|
||||
wm.start()
|
||||
|
||||
@ -356,7 +356,7 @@ class WatchdogMonitorTests(unittest.TestCase):
|
||||
rule = rules[list(rules.keys())[0]]
|
||||
|
||||
from_monitor_reader, from_monitor_writer = Pipe()
|
||||
wm.to_runner = from_monitor_writer
|
||||
wm.to_runner_event = from_monitor_writer
|
||||
|
||||
wm.start()
|
||||
|
||||
@ -437,7 +437,7 @@ class WatchdogMonitorTests(unittest.TestCase):
|
||||
rule = rules[list(rules.keys())[0]]
|
||||
|
||||
from_monitor_reader, from_monitor_writer = Pipe()
|
||||
wm.to_runner = from_monitor_writer
|
||||
wm.to_runner_event = from_monitor_writer
|
||||
|
||||
wm.start()
|
||||
|
||||
@ -508,7 +508,7 @@ class WatchdogMonitorTests(unittest.TestCase):
|
||||
rule = rules[list(rules.keys())[0]]
|
||||
|
||||
from_monitor_reader, from_monitor_writer = Pipe()
|
||||
wm.to_runner = from_monitor_writer
|
||||
wm.to_runner_event = from_monitor_writer
|
||||
|
||||
wm.start()
|
||||
|
||||
|
Reference in New Issue
Block a user