
Revert the change I556b112371bec2ec29cea4dc254bb3f9c6d2c07a: the executor callback API was only used by the aioeventlet executor which was just removed. Change-Id: I1223f32594d8c1be28cc43fdd9bf102c86d75325
146 lines
5.0 KiB
Python
146 lines
5.0 KiB
Python
# Copyright 2011 OpenStack Foundation.
|
|
# All Rights Reserved.
|
|
# Copyright 2013 eNovance
|
|
#
|
|
# 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 threading
|
|
import time
|
|
|
|
from six.moves import mock
|
|
import testscenarios
|
|
|
|
from oslo_messaging._executors import impl_blocking
|
|
try:
|
|
from oslo_messaging._executors import impl_eventlet
|
|
except ImportError:
|
|
impl_eventlet = None
|
|
from oslo_messaging._executors import impl_thread
|
|
from oslo_messaging import dispatcher as dispatcher_base
|
|
from oslo_messaging.tests import utils as test_utils
|
|
|
|
load_tests = testscenarios.load_tests_apply_scenarios
|
|
|
|
|
|
class TestExecutor(test_utils.BaseTestCase):
|
|
@classmethod
|
|
def generate_scenarios(cls):
|
|
impl = [
|
|
('blocking', dict(executor=impl_blocking.BlockingExecutor)),
|
|
('threaded', dict(executor=impl_thread.ThreadExecutor)),
|
|
]
|
|
if impl_eventlet is not None:
|
|
impl.append(
|
|
('eventlet', dict(executor=impl_eventlet.EventletExecutor)))
|
|
cls.scenarios = testscenarios.multiply_scenarios(impl)
|
|
|
|
@staticmethod
|
|
def _run_in_thread(target, executor):
|
|
thread = threading.Thread(target=target, args=(executor,))
|
|
thread.daemon = True
|
|
thread.start()
|
|
return thread
|
|
|
|
def _create_dispatcher(self):
|
|
if impl_blocking is not None:
|
|
blocking_class = impl_blocking.BlockingExecutor
|
|
else:
|
|
blocking_class = None
|
|
is_blocking = (self.executor == blocking_class)
|
|
|
|
if is_blocking:
|
|
def run_executor(executor):
|
|
executor.start()
|
|
executor.execute()
|
|
executor.wait()
|
|
|
|
endpoint = mock.MagicMock(return_value='result')
|
|
event = None
|
|
else:
|
|
def run_executor(executor):
|
|
executor.start()
|
|
executor.wait()
|
|
|
|
endpoint = mock.MagicMock(return_value='result')
|
|
event = None
|
|
|
|
class Dispatcher(dispatcher_base.DispatcherBase):
|
|
def __init__(self, endpoint):
|
|
self.endpoint = endpoint
|
|
self.result = "not set"
|
|
|
|
def _listen(self, transport):
|
|
pass
|
|
|
|
def callback(self, incoming):
|
|
result = self.endpoint(incoming.ctxt,
|
|
incoming.message)
|
|
self.result = result
|
|
return result
|
|
|
|
def __call__(self, incoming):
|
|
return dispatcher_base.DispatcherExecutorContext(
|
|
incoming[0], self.callback)
|
|
|
|
return Dispatcher(endpoint), endpoint, event, run_executor
|
|
|
|
def test_slow_wait(self):
|
|
dispatcher, endpoint, event, run_executor = self._create_dispatcher()
|
|
listener = mock.Mock(spec=['poll', 'stop'])
|
|
executor = self.executor(self.conf, listener, dispatcher)
|
|
incoming_message = mock.MagicMock(ctxt={}, message={'payload': 'data'})
|
|
|
|
def fake_poll(timeout=None, prefetch_size=1):
|
|
time.sleep(0.1)
|
|
if listener.poll.call_count == 10:
|
|
if event is not None:
|
|
event.wait()
|
|
executor.stop()
|
|
else:
|
|
return incoming_message
|
|
|
|
listener.poll.side_effect = fake_poll
|
|
thread = self._run_in_thread(run_executor, executor)
|
|
self.assertFalse(executor.wait(timeout=0.1))
|
|
thread.join()
|
|
self.assertTrue(executor.wait())
|
|
|
|
def test_dead_wait(self):
|
|
(dispatcher, _endpoint, _event,
|
|
_run_executor) = self._create_dispatcher()
|
|
listener = mock.Mock(spec=['poll', 'stop'])
|
|
executor = self.executor(self.conf, listener, dispatcher)
|
|
executor.stop()
|
|
self.assertTrue(executor.wait())
|
|
|
|
def test_executor_dispatch(self):
|
|
dispatcher, endpoint, event, run_executor = self._create_dispatcher()
|
|
listener = mock.Mock(spec=['poll', 'stop'])
|
|
executor = self.executor(self.conf, listener, dispatcher)
|
|
incoming_message = mock.MagicMock(ctxt={}, message={'payload': 'data'})
|
|
|
|
def fake_poll(timeout=None, prefetch_size=1):
|
|
if listener.poll.call_count == 1:
|
|
return [incoming_message]
|
|
if event is not None:
|
|
event.wait()
|
|
executor.stop()
|
|
|
|
listener.poll.side_effect = fake_poll
|
|
thread = self._run_in_thread(run_executor, executor)
|
|
thread.join()
|
|
endpoint.assert_called_once_with({}, {'payload': 'data'})
|
|
self.assertEqual(dispatcher.result, 'result')
|
|
|
|
TestExecutor.generate_scenarios()
|