Skip to content

Commit 9f25ad2

Browse files
committed
removed event loop support from service helper entirely
1 parent c70d29a commit 9f25ad2

3 files changed

Lines changed: 2 additions & 15 deletions

File tree

‎dev_utils/dev_utils/service_helper.py‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,15 @@ def __init__(
1212
iothub_connection_string,
1313
eventhub_connection_string,
1414
eventhub_consumer_group,
15-
event_loop=None,
1615
executor=None,
1716
):
18-
# Keep the passed-in loop as a fallback, but prefer the currently running loop when
19-
# scheduling work so we never attach futures to a different loop than the caller.
20-
self._event_loop_override = event_loop
2117
self._executor = executor or concurrent.futures.ThreadPoolExecutor()
2218
self._inner_object = ServiceHelperSync(
2319
iothub_connection_string, eventhub_connection_string, eventhub_consumer_group
2420
)
2521

26-
def _get_event_loop(self):
27-
try:
28-
return asyncio.get_running_loop()
29-
except RuntimeError:
30-
return self._event_loop_override or asyncio.get_event_loop()
31-
3222
async def _run_in_executor(self, func, *args):
33-
loop = self._get_event_loop()
23+
loop = asyncio.get_running_loop()
3424
return await loop.run_in_executor(self._executor, func, *args)
3525

3626
def set_identity(self, device_id, module_id):

‎tests/e2e/iothub_e2e/pytest.ini‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ junit_logging=all
55
junit_family=xunit2
66
junit_log_passing_tests=True
77
asyncio_mode=auto
8-
asyncio_legacy_mode=true
9-
; asyncio_default_fixture_loop_scope = function
108
addopts=
119
--testdox
1210
--force-testdox

‎tests/e2e/provisioning_e2e/pytest.ini‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
timeout=30
33
testdox_format=plaintext
44
asyncio_mode=auto
5-
asyncio_legacy_mode=true
65
addopts=
76
--testdox
8-
--force-testdox
7+
--force-testdox

0 commit comments

Comments
 (0)