Skip to content

Commit 1039692

Browse files
vivien-applepull[bot]
authored andcommitted
[matter_yamltests] Do not include the pre/post processing to the test timeout (#26680)
1 parent a72b6b4 commit 1039692

File tree

1 file changed

+12
-4
lines changed
  • scripts/py_matter_yamltests/matter_yamltests

1 file changed

+12
-4
lines changed

scripts/py_matter_yamltests/matter_yamltests/runner.py

+12-4
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ def run(self, parser_builder_config: TestParserBuilderConfig, runner_config: Tes
144144
continue
145145

146146
loop = asyncio.get_event_loop()
147-
result = loop.run_until_complete(asyncio.wait_for(
148-
self._run(parser, runner_config), parser.timeout))
147+
result = loop.run_until_complete(
148+
self._run_with_timeout(parser, runner_config))
149149
if isinstance(result, Exception):
150150
raise (result)
151151
elif not result:
@@ -157,11 +157,20 @@ def run(self, parser_builder_config: TestParserBuilderConfig, runner_config: Tes
157157

158158
return parser_builder.done
159159

160-
async def _run(self, parser: TestParser, config: TestRunnerConfig):
160+
async def _run_with_timeout(self, parser: TestParser, config: TestRunnerConfig):
161161
status = True
162162
try:
163163
await self.start()
164+
status = await asyncio.wait_for(self._run(parser, config), parser.timeout)
165+
except Exception as exception:
166+
status = exception
167+
finally:
168+
await self.stop()
169+
return status
164170

171+
async def _run(self, parser: TestParser, config: TestRunnerConfig):
172+
status = True
173+
try:
165174
hooks = config.hooks
166175
hooks.test_start(parser.filename, parser.name, parser.tests.count)
167176

@@ -214,5 +223,4 @@ async def _run(self, parser: TestParser, config: TestRunnerConfig):
214223
except Exception as exception:
215224
status = exception
216225
finally:
217-
await self.stop()
218226
return status

0 commit comments

Comments
 (0)