Small changes in events, and associated tests.

This commit is contained in:
Romain Dorgueil
2017-11-04 13:20:53 +01:00
parent 28884231b3
commit 83fc1743fc
4 changed files with 23 additions and 6 deletions

View File

@ -9,5 +9,5 @@ KILL = 'execution.kill'
class ExecutionEvent(Event):
def __init__(self, graph_context):
self.graph_context = graph_context
def __init__(self, context):
self.context = context

View File

@ -68,12 +68,12 @@ class ConsoleOutputPlugin(Plugin):
def tick(self, event):
if self.isatty and not self.iswindows:
self._write(event.graph_context, rewind=True)
self._write(event.context, rewind=True)
else:
pass # not a tty, or windows, so we'll ignore stats output
def teardown(self, event):
self._write(event.graph_context, rewind=False)
self._write(event.context, rewind=False)
self.redirect_stderr.__exit__(None, None, None)
self.redirect_stdout.__exit__(None, None, None)
@ -127,7 +127,7 @@ class ConsoleOutputPlugin(Plugin):
print(CLEAR_EOL, file=self._stderr)
print(MOVE_CURSOR_UP(t_cnt + 2), file=self._stderr)
def _write(self, graph_context, rewind):
def _write(self, context, rewind):
if settings.PROFILE.get():
if self.counter % 10 and self._append_cache:
append = self._append_cache
@ -138,7 +138,7 @@ class ConsoleOutputPlugin(Plugin):
)
else:
append = ()
self.write(graph_context, prefix=self.prefix, append=append, rewind=rewind)
self.write(context, prefix=self.prefix, append=append, rewind=rewind)
self.counter += 1

View File

@ -0,0 +1,17 @@
from unittest.mock import Mock
from bonobo.execution import events
def test_names():
# This test looks useless, but as it's becoming the pliugin API, I want to make sure that nothing changes here, or
# notice it otherwise.
for name in 'start', 'started', 'tick', 'stop', 'stopped', 'kill':
event_name = getattr(events, name.upper())
assert event_name == '.'.join(('execution', name))
def test_event_object():
# Same logic as above.
c = Mock()
e = events.ExecutionEvent(c)
assert e.context is c