michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: pytest: unify timeouts

Browse source 
Add possibility of passing timeouts from Twister to pytest and unify
various timeouts used in adapters to point to one main timeout.

Signed-off-by: Piotr Golyzniak <piotr.golyzniak@nordicsemi.no>
This commit is contained in:
Piotr Golyzniak 2023-07-04 16:09:21 +02:00 • committed by Anas Nashif
commit b486b2acab
9 changed files with 52 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scripts/pylib/twister/twisterlib/harness.py
View file

@ -231,7 +231,7 @@ class Pytest(Harness):
def pytest_run(self, timeout):
try:
cmd = self.generate_command()
cmd = self.generate_command(timeout)
self.run_command(cmd, timeout)
except PytestHarnessException as pytest_exception:
logger.error(str(pytest_exception))
@ -242,7 +242,7 @@ class Pytest(Harness):
self.instance.handler.make_device_available(self.reserved_serial)
self._update_test_status()
def generate_command(self):
def generate_command(self, timeout):
config = self.instance.testsuite.harness_config
pytest_root = config.get('pytest_root', 'pytest') if config else 'pytest'
pytest_args = config.get('pytest_args', []) if config else []
@ -253,7 +253,8 @@ class Pytest(Harness):
'-q',
os.path.join(self.source_dir, pytest_root),
f'--build-dir={self.running_dir}',
f'--junit-xml={self.report_file}'
f'--junit-xml={self.report_file}',
f'--connection-timeout={timeout}'
]
command.extend(pytest_args)