Skip to content

Commit 84b7bf8

Browse files
committed
refactor testsuite: remove some legacy features from grpc_mockserver
* Remove `before_call_hook` support from `create_grpc_mock` fixture * Remove some `GrpcServiceMock` copy-pasta commit_hash:daf1347f7261b3c38ca02aaa12253280d687170b
1 parent 54f310d commit 84b7bf8

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

testsuite/pytest_plugins/pytest_userver/grpc.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from typing import List
21
from typing import Optional
32

43
import pytest
@@ -10,13 +9,7 @@ def _guess_servicer(module) -> str:
109
return str(guesses[0])
1110

1211

13-
def make_mock_grpc(
14-
module,
15-
*,
16-
fixture_name: str,
17-
servicer: Optional[str] = None,
18-
stream_method_names: Optional[List[str]] = None,
19-
):
12+
def make_mock_grpc(module, *, fixture_name: str, servicer: Optional[str] = None):
2013
"""
2114
@deprecated Use
2215
@ref pytest_userver.plugins.grpc.mockserver.grpc_mockserver_new "grpc_mockserver_new"

testsuite/pytest_plugins/pytest_userver/plugins/grpc/mockserver.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ def _wrap_grpc_method(
332332
default_unimplemented_method: Callable,
333333
response_streaming: bool,
334334
mocked_methods: Dict[str, Callable],
335-
before_call_hook: Optional[Callable[..., None]],
336335
):
337336
if response_streaming:
338337

@@ -342,8 +341,6 @@ async def run_stream_response_method(self, request_or_stream, context: grpc.aio.
342341
if method is None:
343342
_raise_unimplemented_error(context, full_rpc_name)
344343

345-
if before_call_hook is not None:
346-
before_call_hook(request_or_stream, context)
347344
async for response in await method(request_or_stream, context):
348345
yield response
349346

@@ -356,9 +353,11 @@ async def run_unary_response_method(self, request_or_stream, context: grpc.aio.S
356353
if method is None:
357354
_raise_unimplemented_error(context, full_rpc_name)
358355

359-
if before_call_hook is not None:
360-
before_call_hook(request_or_stream, context)
361-
return await method(request_or_stream, context)
356+
response = method(request_or_stream, context)
357+
if inspect.isawaitable(response):
358+
return await response
359+
else:
360+
return response
362361

363362
return run_unary_response_method
364363

@@ -375,7 +374,6 @@ def _create_servicer_mock(
375374
*,
376375
# TODO remove, these no longer do anything
377376
stream_method_names: Optional[List[str]] = None,
378-
before_call_hook: Optional[Callable[..., None]] = None,
379377
) -> GrpcServiceMock:
380378
_check_is_servicer_class(servicer_class)
381379
reflection = _reflect_servicer(servicer_class)
@@ -397,7 +395,6 @@ def _create_servicer_mock(
397395
default_unimplemented_method=value,
398396
response_streaming=reflection[attname].response_streaming,
399397
mocked_methods=mocked_methods,
400-
before_call_hook=before_call_hook,
401398
)
402399
mocked_servicer_class = type(
403400
f'Mock{servicer_class.__name__}',

0 commit comments

Comments
 (0)