Merge "update uses of TimingListener to DurationListener"

This commit is contained in:
Jenkins
2015-03-12 22:37:05 +00:00
committed by Gerrit Code Review
2 changed files with 6 additions and 6 deletions

View File

@@ -55,5 +55,5 @@ class VariableTask(task.Task):
f = lf.Flow('root') f = lf.Flow('root')
f.add(VariableTask('a'), VariableTask('b'), VariableTask('c')) f.add(VariableTask('a'), VariableTask('b'), VariableTask('c'))
e = engines.load(f) e = engines.load(f)
with timing.PrintingTimingListener(e): with timing.PrintingDurationListener(e):
e.run() e.run()

View File

@@ -202,14 +202,14 @@ class TestClaimListener(test.TestCase, EngineMakerMixin):
self.assertEqual(1, ran_states.count(states.WAITING)) self.assertEqual(1, ran_states.count(states.WAITING))
class TestTimingListener(test.TestCase, EngineMakerMixin): class TestDurationListener(test.TestCase, EngineMakerMixin):
def test_duration(self): def test_duration(self):
with contextlib.closing(impl_memory.MemoryBackend()) as be: with contextlib.closing(impl_memory.MemoryBackend()) as be:
flow = lf.Flow("test") flow = lf.Flow("test")
flow.add(SleepyTask("test-1", sleep_for=0.1)) flow.add(SleepyTask("test-1", sleep_for=0.1))
(lb, fd) = persistence_utils.temporary_flow_detail(be) (lb, fd) = persistence_utils.temporary_flow_detail(be)
e = self._make_engine(flow, fd, be) e = self._make_engine(flow, fd, be)
with timing.TimingListener(e): with timing.DurationListener(e):
e.run() e.run()
t_uuid = e.storage.get_atom_uuid("test-1") t_uuid = e.storage.get_atom_uuid("test-1")
td = fd.find(t_uuid) td = fd.find(t_uuid)
@@ -225,11 +225,11 @@ class TestTimingListener(test.TestCase, EngineMakerMixin):
flow.add(test_utils.TaskNoRequiresNoReturns("test-1")) flow.add(test_utils.TaskNoRequiresNoReturns("test-1"))
(lb, fd) = persistence_utils.temporary_flow_detail(be) (lb, fd) = persistence_utils.temporary_flow_detail(be)
e = self._make_engine(flow, fd, be) e = self._make_engine(flow, fd, be)
timing_listener = timing.TimingListener(e) duration_listener = timing.DurationListener(e)
with mock.patch.object(timing_listener._engine.storage, with mock.patch.object(duration_listener._engine.storage,
'update_atom_metadata') as mocked_uam: 'update_atom_metadata') as mocked_uam:
mocked_uam.side_effect = exc.StorageFailure('Woot!') mocked_uam.side_effect = exc.StorageFailure('Woot!')
with timing_listener: with duration_listener:
e.run() e.run()
mocked_warn.assert_called_once_with(mock.ANY, mock.ANY, 'test-1', mocked_warn.assert_called_once_with(mock.ANY, mock.ANY, 'test-1',
exc_info=True) exc_info=True)