OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

iotests: Allow skipping test cases

Browse Source 
case_notrun() does not actually skip the current test case.  It just
adds a "notrun" note and then returns to the caller, who manually has to
skip the test.  Generally, skipping a test case is as simple as
returning from the current function, but not always: For example, this
model does not allow skipping tests already in the setUp() function.

Thus, add a QMPTestCase.case_skip() function that invokes case_notrun()
and then self.skipTest().  To make this work, we need to filter the
information on how many test cases were skipped from the unittest
output.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Message-id: 20190917092004.999-3-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Max Reitz 2019-09-17 11:19:59 +02:00
parent a6f8f9f82c
commit 6be0122520
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/qemu-iotests/iotests.py
View File

@ -838,6 +838,11 @@ class QMPTestCase(unittest.TestCase):
return self.pause_wait(job_id) return self.pause_wait(job_id)
return result return result
def case_skip(self, reason):
'''Skip this test case'''
case_notrun(reason)
self.skipTest(reason)
def notrun(reason): def notrun(reason):
'''Skip this test suite''' '''Skip this test suite'''
@ -849,7 +854,11 @@ def notrun(reason):
sys.exit(0) sys.exit(0)
def case_notrun(reason): def case_notrun(reason):
'''Skip this test case''' '''Mark this test case as not having been run (without actually
skipping it, that is left to the caller). See
QMPTestCase.case_skip() for a variant that actually skips the
current test case.'''
# Each test in qemu-iotests has a number ("seq") # Each test in qemu-iotests has a number ("seq")
seq = os.path.basename(sys.argv[0]) seq = os.path.basename(sys.argv[0])
@ -950,8 +959,15 @@ def execute_unittest(output, verbosity, debug):
unittest.main(testRunner=runner) unittest.main(testRunner=runner)
finally: finally:
if not debug: if not debug:
sys.stderr.write(re.sub(r'Ran (\d+) tests? in [\d.]+s', out = output.getvalue()
r'Ran \1 tests', output.getvalue())) out = re.sub(r'Ran (\d+) tests? in [\d.]+s', r'Ran \1 tests', out)
# Hide skipped tests from the reference output
out = re.sub(r'OK \(skipped=\d+\)', 'OK', out)
out_first_line, out_rest = out.split('\n', 1)
out = out_first_line.replace('s', '.') + '\n' + out_rest
sys.stderr.write(out)
def execute_test(test_function=None, def execute_test(test_function=None,
supported_fmts=[], supported_oses=['linux'], supported_fmts=[], supported_oses=['linux'],