From c17a30b8fdf412f825a4d2f4eaefaa3833bad9bd Mon Sep 17 00:00:00 2001 From: Stefan Behnel Date: Sat, 13 Mar 2010 08:18:11 +0100 Subject: [PATCH] disable forked testing when collecting test results as XML, doesn't currently work together --- Cython/Tests/xmlrunner.py | 14 +++++--------- runtests.py | 5 +++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Cython/Tests/xmlrunner.py b/Cython/Tests/xmlrunner.py index e72b139f..cd9e37f7 100644 --- a/Cython/Tests/xmlrunner.py +++ b/Cython/Tests/xmlrunner.py @@ -155,15 +155,11 @@ class _XMLTestResult(_TextTestResult): "Write some information about the FAIL or ERROR to the stream." for test_info in errors: self.stream.writeln(self.separator1) - if isinstance(test_info, _TestInfo): - self.stream.writeln('%s [%.3fs]: %s' % \ - (flavour, test_info.get_elapsed_time(), \ - test_info.get_description())) - self.stream.writeln(self.separator2) - self.stream.writeln('%s' % test_info.get_error_info()) - else: - self.stream.writeln(str(test_info)) - self.stream.writeln(self.separator2) + self.stream.writeln('%s [%.3fs]: %s' % \ + (flavour, test_info.get_elapsed_time(), \ + test_info.get_description())) + self.stream.writeln(self.separator2) + self.stream.writeln('%s' % test_info.get_error_info()) def _get_info_by_testcase(self): """This method organizes test results by TestCase module. This diff --git a/runtests.py b/runtests.py index 226bf9dd..6000de53 100644 --- a/runtests.py +++ b/runtests.py @@ -882,6 +882,11 @@ if __name__ == '__main__': if options.doctests: 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: filetests = TestBuilder(ROOTDIR, WORKDIR, selectors, exclude_selectors, options.annotate_source, options.cleanup_workdir, -- 2.26.2