Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python-tester: concatenate description (docstring) to test name #121

Merged
merged 2 commits into from
Oct 2, 2018
Merged

python-tester: concatenate description (docstring) to test name #121

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05e1596
python-tester: concatenate description (docstring) to test name
mishaschwartz Oct 1, 2018
e7cab5c
python-tester: change format of description in test name
mishaschwartz Oct 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions testers/python/server/markus_python_tester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,34 @@ def __init__(self, stream, descriptions, verbosity):
def addSuccess(self, test):
self.results.append({'status': 'success',
'name' : test.id(),
'errors': ''})
'errors': '',
'description': test._testMethodDoc})
self.successes.append(test)

def addFailure(self, test, err):
super().addFailure(test, err)
self.results.append({'status': 'failure',
'name' : test.id(),
'errors': self.failures[-1][-1]})
'errors': self.failures[-1][-1],
'description': test._testMethodDoc})

def addError(self, test, err):
super().addError(test, err)
self.results.append({'status': 'error',
'name' : test.id(),
'errors': self.errors[-1][-1]})
'errors': self.errors[-1][-1],
'description': test._testMethodDoc})

class AddDocstringToJunitXMLPlugin(object):
def pytest_itemcollected(self, item):
docstring = item.obj.__doc__ or ''
item.user_properties.append(("description", docstring))

class MarkusPythonTest(MarkusTest):

def __init__(self, tester, feedback_open, test_file, result):
self._test_name = result['name']
self.description = result.get('description')
all_points = tester.specs.matrix[test_file][MarkusTestSpecs.MATRIX_NODATA_KEY]
points = all_points.get(self._test_name, 1)
self.status = result['status']
Expand All @@ -51,7 +60,10 @@ def __init__(self, tester, feedback_open, test_file, result):

@property
def test_name(self):
return self._test_name
if self.description:
return f'{self._test_name} ({self.description})'
else:
return self._test_name

def run(self):
if self.status == "success":
Expand Down Expand Up @@ -101,6 +113,9 @@ def _parse_junitxml(self, xml_filename):
if error is not None:
result['status'] = 'error'
result['errors'] = error.text
description = testcase.find("./properties/property[@name='description']")
if description is not None:
result['description'] = description.attrib['value']
yield result

def _run_unittest_tests(self, test_file):
Expand Down Expand Up @@ -130,7 +145,7 @@ def _run_pytest_tests(self, test_file):
legacy_venv_dir = self.specs.get('legacy_virtualenv')
if legacy_venv_dir is None:
with tempfile.NamedTemporaryFile(mode="w+", dir=this_dir) as sf:
pytest.main([test_file, '--junitxml', sf.name])
pytest.main([test_file, '--junitxml', sf.name], plugins=[AddDocstringToJunitXMLPlugin()])
results = list(self._parse_junitxml(sf))
else:
try:
Expand Down