Commit c17a30b8 authored by Stefan Behnel's avatar Stefan Behnel

disable forked testing when collecting test results as XML, doesn't currently work together

parent 255f319b
...@@ -155,15 +155,11 @@ class _XMLTestResult(_TextTestResult): ...@@ -155,15 +155,11 @@ class _XMLTestResult(_TextTestResult):
"Write some information about the FAIL or ERROR to the stream." "Write some information about the FAIL or ERROR to the stream."
for test_info in errors: for test_info in errors:
self.stream.writeln(self.separator1) self.stream.writeln(self.separator1)
if isinstance(test_info, _TestInfo): self.stream.writeln('%s [%.3fs]: %s' % \
self.stream.writeln('%s [%.3fs]: %s' % \ (flavour, test_info.get_elapsed_time(), \
(flavour, test_info.get_elapsed_time(), \ test_info.get_description()))
test_info.get_description())) self.stream.writeln(self.separator2)
self.stream.writeln(self.separator2) self.stream.writeln('%s' % test_info.get_error_info())
self.stream.writeln('%s' % test_info.get_error_info())
else:
self.stream.writeln(str(test_info))
self.stream.writeln(self.separator2)
def _get_info_by_testcase(self): def _get_info_by_testcase(self):
"""This method organizes test results by TestCase module. This """This method organizes test results by TestCase module. This
......
...@@ -882,6 +882,11 @@ if __name__ == '__main__': ...@@ -882,6 +882,11 @@ if __name__ == '__main__':
if options.doctests: if options.doctests:
collect_doctests(UNITTEST_ROOT, UNITTEST_MODULE + ".", test_suite, selectors) collect_doctests(UNITTEST_ROOT, UNITTEST_MODULE + ".", test_suite, selectors)
if options.xml_output_dir:
# doesn't currently work together
print("Disabling forked testing to support XML test output")
options.fork = False
if options.filetests and languages: if options.filetests and languages:
filetests = TestBuilder(ROOTDIR, WORKDIR, selectors, exclude_selectors, filetests = TestBuilder(ROOTDIR, WORKDIR, selectors, exclude_selectors,
options.annotate_source, options.cleanup_workdir, options.annotate_source, options.cleanup_workdir,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment