mirror of https://github.com/proxmox/mirror_qemu
iotests/testrunner.py: refactor test_field_width
A lot of Optional[] types doesn't make code beautiful. test_field_width defaults to 8, but that is never used in the code. More over, if we want some default behavior for single call of test_run(), it should just print the whole test name, not limiting or expanding its width, so 8 is bad default. So, just drop the default as unused for now. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Message-Id: <20211210201450.101576-1-vsementsov@virtuozzo.com> Reviewed-by: John Snow <jsnow@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>master
parent
64631f3681
commit
e5e7487395
|
@ -174,19 +174,17 @@ class TestRunner(ContextManager['TestRunner']):
|
||||||
def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
|
def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
|
||||||
self._stack.close()
|
self._stack.close()
|
||||||
|
|
||||||
def test_print_one_line(self, test: str, starttime: str,
|
def test_print_one_line(self, test: str,
|
||||||
|
test_field_width: int,
|
||||||
|
starttime: str,
|
||||||
endtime: Optional[str] = None, status: str = '...',
|
endtime: Optional[str] = None, status: str = '...',
|
||||||
lasttime: Optional[float] = None,
|
lasttime: Optional[float] = None,
|
||||||
thistime: Optional[float] = None,
|
thistime: Optional[float] = None,
|
||||||
description: str = '',
|
description: str = '',
|
||||||
test_field_width: Optional[int] = None,
|
|
||||||
end: str = '\n') -> None:
|
end: str = '\n') -> None:
|
||||||
""" Print short test info before/after test run """
|
""" Print short test info before/after test run """
|
||||||
test = os.path.basename(test)
|
test = os.path.basename(test)
|
||||||
|
|
||||||
if test_field_width is None:
|
|
||||||
test_field_width = 8
|
|
||||||
|
|
||||||
if self.makecheck and status != '...':
|
if self.makecheck and status != '...':
|
||||||
if status and status != 'pass':
|
if status and status != 'pass':
|
||||||
status = f' [{status}]'
|
status = f' [{status}]'
|
||||||
|
@ -328,7 +326,7 @@ class TestRunner(ContextManager['TestRunner']):
|
||||||
casenotrun=casenotrun)
|
casenotrun=casenotrun)
|
||||||
|
|
||||||
def run_test(self, test: str,
|
def run_test(self, test: str,
|
||||||
test_field_width: Optional[int] = None,
|
test_field_width: int,
|
||||||
mp: bool = False) -> TestResult:
|
mp: bool = False) -> TestResult:
|
||||||
"""
|
"""
|
||||||
Run one test and print short status
|
Run one test and print short status
|
||||||
|
@ -347,20 +345,21 @@ class TestRunner(ContextManager['TestRunner']):
|
||||||
|
|
||||||
if not self.makecheck:
|
if not self.makecheck:
|
||||||
self.test_print_one_line(test=test,
|
self.test_print_one_line(test=test,
|
||||||
|
test_field_width=test_field_width,
|
||||||
status = 'started' if mp else '...',
|
status = 'started' if mp else '...',
|
||||||
starttime=start,
|
starttime=start,
|
||||||
lasttime=last_el,
|
lasttime=last_el,
|
||||||
end = '\n' if mp else '\r',
|
end = '\n' if mp else '\r')
|
||||||
test_field_width=test_field_width)
|
|
||||||
|
|
||||||
res = self.do_run_test(test, mp)
|
res = self.do_run_test(test, mp)
|
||||||
|
|
||||||
end = datetime.datetime.now().strftime('%H:%M:%S')
|
end = datetime.datetime.now().strftime('%H:%M:%S')
|
||||||
self.test_print_one_line(test=test, status=res.status,
|
self.test_print_one_line(test=test,
|
||||||
|
test_field_width=test_field_width,
|
||||||
|
status=res.status,
|
||||||
starttime=start, endtime=end,
|
starttime=start, endtime=end,
|
||||||
lasttime=last_el, thistime=res.elapsed,
|
lasttime=last_el, thistime=res.elapsed,
|
||||||
description=res.description,
|
description=res.description)
|
||||||
test_field_width=test_field_width)
|
|
||||||
|
|
||||||
if res.casenotrun:
|
if res.casenotrun:
|
||||||
print(res.casenotrun)
|
print(res.casenotrun)
|
||||||
|
|
Loading…
Reference in New Issue