Skip to content

Commit 4358124

Browse files
krypton36pull[bot]
authored andcommitted
Update runner run function to be async. (#27048)
1 parent 8359f06 commit 4358124

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

scripts/py_matter_yamltests/matter_yamltests/runner.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ async def execute(self, request):
133133
async def stop(self):
134134
return
135135

136-
def run(self, parser_builder_config: TestParserBuilderConfig, runner_config: TestRunnerConfig):
136+
async def run(self, parser_builder_config: TestParserBuilderConfig, runner_config: TestRunnerConfig):
137137
if runner_config and runner_config.hooks:
138138
start = time.time()
139139
runner_config.hooks.start(len(parser_builder_config.tests))
@@ -143,9 +143,7 @@ def run(self, parser_builder_config: TestParserBuilderConfig, runner_config: Tes
143143
if not parser or not runner_config:
144144
continue
145145

146-
loop = asyncio.get_event_loop()
147-
result = loop.run_until_complete(
148-
self._run_with_timeout(parser, runner_config))
146+
result = await self._run_with_timeout(parser, runner_config)
149147
if isinstance(result, Exception):
150148
raise (result)
151149
elif not result:

scripts/tests/yaml/runner.py

+11-5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import relative_importer # isort: split # noqa: F401
1818

19+
import asyncio
1920
import importlib
2021
import os
2122
import sys
@@ -269,7 +270,8 @@ def parse(parser_group: ParserGroup):
269270
runner_config = None
270271

271272
runner = TestRunner()
272-
return runner.run(parser_group.builder_config, runner_config)
273+
loop = asyncio.get_event_loop()
274+
return loop.run_until_complete(runner.run(parser_group.builder_config, runner_config))
273275

274276

275277
@runner_base.command()
@@ -279,7 +281,8 @@ def dry_run(parser_group: ParserGroup):
279281
runner_config = TestRunnerConfig(hooks=TestRunnerLogger())
280282

281283
runner = TestRunner()
282-
return runner.run(parser_group.builder_config, runner_config)
284+
loop = asyncio.get_event_loop()
285+
return loop.run_until_complete(runner.run(parser_group.builder_config, runner_config))
283286

284287

285288
@runner_base.command()
@@ -293,7 +296,8 @@ def run(parser_group: ParserGroup, adapter: str, stop_on_error: bool, stop_on_wa
293296
runner_config = TestRunnerConfig(adapter, parser_group.pseudo_clusters, runner_options, runner_hooks)
294297

295298
runner = TestRunner()
296-
return runner.run(parser_group.builder_config, runner_config)
299+
loop = asyncio.get_event_loop()
300+
return loop.run_until_complete(runner.run(parser_group.builder_config, runner_config))
297301

298302

299303
@runner_base.command()
@@ -316,7 +320,8 @@ def websocket(parser_group: ParserGroup, adapter: str, stop_on_error: bool, stop
316320
server_address, server_port, server_path, server_arguments, websocket_runner_hooks)
317321

318322
runner = WebSocketRunner(websocket_runner_config)
319-
return runner.run(parser_group.builder_config, runner_config)
323+
loop = asyncio.get_event_loop()
324+
return loop.run_until_complete(runner.run(parser_group.builder_config, runner_config))
320325

321326

322327
@runner_base.command()
@@ -331,7 +336,8 @@ def chip_repl(parser_group: ParserGroup, adapter: str, stop_on_error: bool, stop
331336
runner_config = TestRunnerConfig(adapter, parser_group.pseudo_clusters, runner_options, runner_hooks)
332337

333338
runner = __import__(runner, fromlist=[None]).Runner(repl_storage_path, commission_on_network_dut)
334-
return runner.run(parser_group.builder_config, runner_config)
339+
loop = asyncio.get_event_loop()
340+
return loop.run_until_complete(runner.run(parser_group.builder_config, runner_config))
335341

336342

337343
@runner_base.command()

0 commit comments

Comments
 (0)