
Instead of having code that is some what like the notifier code we already have, but is duplicated and is slightly different in the task class just move the code that was in the task class (and doing similar actions) to instead now use a notifier that is directly contained in the task base class for internal task triggering of internal task events. Breaking change: alters the capabilities of the task to process notifications itself, most actions now must go through the task notifier property and instead use that (update_progress still exists as a common utility method, since it's likely the most common type of notification that will be used). Removes the following methods from task base class (as they are no longer needed with a notifier attribute): - trigger (replaced with notifier.notify) - autobind (removed, not replaced, can be created by the user of taskflow in a simple manner, without requiring functionality in taskflow) - bind (replaced with notifier.register) - unbind (replaced with notifier.unregister) - listeners_iter (replaced with notifier.listeners_iter) Due to this change we can now also correctly proxy back events from remote tasks to the engine for correct proxying back to the original task. Fixes bug 1370766 Change-Id: Ic9dfef516d72e6e32e71dda30a1cb3522c9e0be6
148 lines
5.1 KiB
Python
148 lines
5.1 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Copyright (C) 2012 Yahoo! Inc. All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import contextlib
|
|
|
|
import taskflow.engines
|
|
from taskflow.patterns import linear_flow as lf
|
|
from taskflow.persistence.backends import impl_memory
|
|
from taskflow import task
|
|
from taskflow import test
|
|
from taskflow.utils import persistence_utils as p_utils
|
|
|
|
|
|
class ProgressTask(task.Task):
|
|
def __init__(self, name, segments):
|
|
super(ProgressTask, self).__init__(name=name)
|
|
self._segments = segments
|
|
|
|
def execute(self):
|
|
if self._segments <= 0:
|
|
return
|
|
for i in range(1, self._segments):
|
|
progress = float(i) / self._segments
|
|
self.update_progress(progress)
|
|
|
|
|
|
class ProgressTaskWithDetails(task.Task):
|
|
def execute(self):
|
|
details = {
|
|
'progress': 0.5,
|
|
'test': 'test data',
|
|
'foo': 'bar',
|
|
}
|
|
self.notifier.notify(task.EVENT_UPDATE_PROGRESS, details)
|
|
|
|
|
|
class TestProgress(test.TestCase):
|
|
def _make_engine(self, flow, flow_detail=None, backend=None):
|
|
e = taskflow.engines.load(flow,
|
|
flow_detail=flow_detail,
|
|
backend=backend)
|
|
e.compile()
|
|
e.prepare()
|
|
return e
|
|
|
|
def tearDown(self):
|
|
super(TestProgress, self).tearDown()
|
|
with contextlib.closing(impl_memory.MemoryBackend({})) as be:
|
|
with contextlib.closing(be.get_connection()) as conn:
|
|
conn.clear_all()
|
|
|
|
def test_sanity_progress(self):
|
|
fired_events = []
|
|
|
|
def notify_me(event_type, details):
|
|
fired_events.append(details.pop('progress'))
|
|
|
|
ev_count = 5
|
|
t = ProgressTask("test", ev_count)
|
|
t.notifier.register(task.EVENT_UPDATE_PROGRESS, notify_me)
|
|
flo = lf.Flow("test")
|
|
flo.add(t)
|
|
e = self._make_engine(flo)
|
|
e.run()
|
|
self.assertEqual(ev_count + 1, len(fired_events))
|
|
self.assertEqual(1.0, fired_events[-1])
|
|
self.assertEqual(0.0, fired_events[0])
|
|
|
|
def test_no_segments_progress(self):
|
|
fired_events = []
|
|
|
|
def notify_me(event_type, details):
|
|
fired_events.append(details.pop('progress'))
|
|
|
|
t = ProgressTask("test", 0)
|
|
t.notifier.register(task.EVENT_UPDATE_PROGRESS, notify_me)
|
|
flo = lf.Flow("test")
|
|
flo.add(t)
|
|
e = self._make_engine(flo)
|
|
e.run()
|
|
# 0.0 and 1.0 should be automatically fired
|
|
self.assertEqual(2, len(fired_events))
|
|
self.assertEqual(1.0, fired_events[-1])
|
|
self.assertEqual(0.0, fired_events[0])
|
|
|
|
def test_storage_progress(self):
|
|
with contextlib.closing(impl_memory.MemoryBackend({})) as be:
|
|
flo = lf.Flow("test")
|
|
flo.add(ProgressTask("test", 3))
|
|
b, fd = p_utils.temporary_flow_detail(be)
|
|
e = self._make_engine(flo, flow_detail=fd, backend=be)
|
|
e.run()
|
|
end_progress = e.storage.get_task_progress("test")
|
|
self.assertEqual(1.0, end_progress)
|
|
task_uuid = e.storage.get_atom_uuid("test")
|
|
td = fd.find(task_uuid)
|
|
self.assertEqual(1.0, td.meta['progress'])
|
|
self.assertFalse(td.meta['progress_details'])
|
|
|
|
def test_storage_progress_detail(self):
|
|
flo = ProgressTaskWithDetails("test")
|
|
e = self._make_engine(flo)
|
|
e.run()
|
|
end_progress = e.storage.get_task_progress("test")
|
|
self.assertEqual(1.0, end_progress)
|
|
end_details = e.storage.get_task_progress_details("test")
|
|
self.assertEqual(end_details.get('at_progress'), 0.5)
|
|
self.assertEqual(end_details.get('details'), {
|
|
'test': 'test data',
|
|
'foo': 'bar'
|
|
})
|
|
|
|
def test_dual_storage_progress(self):
|
|
fired_events = []
|
|
|
|
def notify_me(event_type, details):
|
|
fired_events.append(details.pop('progress'))
|
|
|
|
with contextlib.closing(impl_memory.MemoryBackend({})) as be:
|
|
t = ProgressTask("test", 5)
|
|
t.notifier.register(task.EVENT_UPDATE_PROGRESS, notify_me)
|
|
flo = lf.Flow("test")
|
|
flo.add(t)
|
|
b, fd = p_utils.temporary_flow_detail(be)
|
|
e = self._make_engine(flo, flow_detail=fd, backend=be)
|
|
e.run()
|
|
|
|
end_progress = e.storage.get_task_progress("test")
|
|
self.assertEqual(1.0, end_progress)
|
|
task_uuid = e.storage.get_atom_uuid("test")
|
|
td = fd.find(task_uuid)
|
|
self.assertEqual(1.0, td.meta['progress'])
|
|
self.assertFalse(td.meta['progress_details'])
|
|
self.assertEqual(6, len(fired_events))
|