Author: bugman Date: Mon Apr 21 14:30:19 2008 New Revision: 5915 URL: http://svn.gna.org/viewcvs/relax?rev=5915&view=rev Log: Wrote the RelaxTestRunner.addFailure() replacement method to prepend STDERR/STDOUT to the message. Modified: 1.3/test_suite/relax_test_runner.py Modified: 1.3/test_suite/relax_test_runner.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/relax_test_runner.py?rev=5915&r1=5914&r2=5915&view=diff ============================================================================== --- 1.3/test_suite/relax_test_runner.py (original) +++ 1.3/test_suite/relax_test_runner.py Mon Apr 21 14:30:19 2008 @@ -80,6 +80,22 @@ self.errors[-1] = (self.errors[-1][0], self.capt_stdout.getvalue() + self.errors[-1][1]) + def addFailure(self, test, err): + """Override of the TestResult.addFailure() method. + + The STDOUT captured text is prepended to the error text here. + """ + + # Execute the normal addFailure method. + _TextTestResult.addFailure(self, test, err) + + # Prepend STDERR to the second element of the tuple. + self.failures[-1] = (self.failures[-1][0], self.capt_stderr.getvalue() + self.failures[-1][1]) + + # Prepend STDOUT to the second element of the tuple. + self.failures[-1] = (self.failures[-1][0], self.capt_stdout.getvalue() + self.failures[-1][1]) + + class RelaxTestRunner(TextTestRunner):