Merge "Drop explicit executor argument"

This commit is contained in:
Zuul
2025-06-03 15:48:27 +00:00
committed by Gerrit Code Review
2 changed files with 6 additions and 8 deletions

View File

@@ -199,7 +199,6 @@ def get_server(target, endpoints, serializer=None):
TRANSPORT, TRANSPORT,
target, target,
endpoints, endpoints,
executor='eventlet',
serializer=serializer, serializer=serializer,
access_policy=access_policy access_policy=access_policy
) )
@@ -214,7 +213,6 @@ def get_notification_listener(targets, endpoints, serializer=None, pool=None):
NOTIFICATION_TRANSPORT, NOTIFICATION_TRANSPORT,
targets, targets,
endpoints, endpoints,
executor='eventlet',
pool=pool, pool=pool,
serializer=serializer serializer=serializer
) )

View File

@@ -177,7 +177,7 @@ class RPCTest(oslotest.base.BaseTestCase):
mock_get_rpc_server.assert_called_with( mock_get_rpc_server.assert_called_with(
True, None, None, True, None, None,
executor='eventlet', serializer=mock.ANY, serializer=mock.ANY,
access_policy=mock.ANY, access_policy=mock.ANY,
) )
@@ -213,19 +213,19 @@ class RPCTest(oslotest.base.BaseTestCase):
rpc.get_notification_listener('target', 'endpoint', serializer=None) rpc.get_notification_listener('target', 'endpoint', serializer=None)
mock_get_notification_listener.assert_called_with( mock_get_notification_listener.assert_called_with(
True, 'target', 'endpoint', executor='eventlet', pool=None, True, 'target', 'endpoint', pool=None, serializer=mock.ANY
serializer=mock.ANY
) )
@mock.patch.object(designate.rpc, 'NOTIFICATION_TRANSPORT', True) @mock.patch.object(designate.rpc, 'NOTIFICATION_TRANSPORT', True)
@mock.patch.object(messaging, 'get_notification_listener') @mock.patch.object(messaging, 'get_notification_listener')
def test_get_notification_listener_serializer_set(self, def test_get_notification_listener_serializer_set(self,
mock_get_notification_listener): mock_get_notification_listener):
rpc.get_notification_listener('target', 'endpoint', serializer=True) serializer = mock.Mock()
rpc.get_notification_listener('target', 'endpoint',
serializer=serializer)
mock_get_notification_listener.assert_called_with( mock_get_notification_listener.assert_called_with(
True, 'target', 'endpoint', executor='eventlet', pool=None, True, 'target', 'endpoint', pool=None, serializer=serializer
serializer=True
) )
@mock.patch.object(designate.rpc, 'NOTIFICATION_TRANSPORT', None) @mock.patch.object(designate.rpc, 'NOTIFICATION_TRANSPORT', None)