[Proctor-checkins] CVS: Proctor/proctorlib runner.py,1.13,1.14

[Doug H. <dou...@us...>]

Update of /cvsroot/proctor/Proctor/proctorlib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20227/proctorlib

Modified Files:
	runner.py 
Log Message:
Preserve a reference to sys.stdout for our output, since a test might replace it

Index: runner.py
===================================================================
RCS file: /cvsroot/proctor/Proctor/proctorlib/runner.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** runner.py	1 May 2006 12:48:08 -0000	1.13
--- runner.py	16 Jun 2006 17:45:49 -0000	1.14
***************
*** 66,69 ****
--- 66,74 ----
  
  #
+ # Preserve stdout in case some test overrides it
+ #
+ STDOUT=sys.stdout
+ 
+ #
  # Import Local modules
  #
***************
*** 106,114 ****
          elapsed_time = float(self.end_time - self.start_time)
          
!         print
!         print "Ran %d test%s in %.3fs" % (run,
!                                           run == 1 and "" or "s",
!                                           elapsed_time)
!         print
  
          if not self.wasSuccessful():
--- 111,119 ----
          elapsed_time = float(self.end_time - self.start_time)
          
!         STDOUT.write('\n')
!         STDOUT.write("Ran %d test%s in %.3fs\n" % (run,
!                                                    run == 1 and "" or "s",
!                                                    elapsed_time))
!         STDOUT.write('\n')
  
          if not self.wasSuccessful():
***************
*** 131,138 ****
                  errors = ''
  
!             print "FAILED (%s%s)" % (failures, errors)
  
          else:
!             print "OK"
          return
  
--- 136,143 ----
                  errors = ''
  
!             STDOUT.write("FAILED (%s%s)\n" % (failures, errors))
  
          else:
!             STDOUT.write("OK\n")
          return
  
***************
*** 148,153 ****
                                              desc,
                                              )
!         print progress_line,
!         sys.stdout.flush()
  
          self.num_tests_run += 1
--- 153,158 ----
                                              desc,
                                              )
!         STDOUT.write(progress_line)
!         STDOUT.flush()
  
          self.num_tests_run += 1
***************
*** 239,245 ****
          trace.into('TestResult', 'addError', test=test, err=err)
          unittest.TestResult.addError(self, test, err)
!         print 'ERROR in', test.id()
!         print self._exc_info_to_string(err, test)
!         sys.stdout.flush()
          trace.outof()
          return
--- 244,251 ----
          trace.into('TestResult', 'addError', test=test, err=err)
          unittest.TestResult.addError(self, test, err)
!         STDOUT.write('ERROR in %s\n' % test.id())
!         STDOUT.write(self._exc_info_to_string(err, test))
!         STDOUT.write('\n')
!         STDOUT.flush()
          trace.outof()
          return
***************
*** 248,255 ****
          trace.into('TestResult', 'addFailure', test=test, err=err)
          unittest.TestResult.addFailure(self, test, err)
!         print 'FAIL in', test.id()
!         print self._exc_info_to_string(err, test)
!         print
!         sys.stdout.flush()
          trace.outof()
          return
--- 254,261 ----
          trace.into('TestResult', 'addFailure', test=test, err=err)
          unittest.TestResult.addFailure(self, test, err)
!         STDOUT.write('FAIL in %s\n' % test.id())
!         STDOUT.write(self._exc_info_to_string(err, test))
!         STDOUT.write('\n')
!         STDOUT.flush()
          trace.outof()
          return
***************
*** 259,264 ****
  
          unittest.TestResult.addSuccess(self, test)
!         print 'ok'
!         sys.stdout.flush()
          
          trace.outof()
--- 265,270 ----
  
          unittest.TestResult.addSuccess(self, test)
!         STDOUT.write('ok\n')
!         STDOUT.flush()
          
          trace.outof()
***************
*** 286,292 ****
  
      def _outputSeparator(self, message):
!         print '%s %s' % (self.PREFIX, message)
!         print
!         sys.stdout.flush()
          return
      
--- 292,297 ----
  
      def _outputSeparator(self, message):
!         STDOUT.write('%s %s\n\n' % (self.PREFIX, message))
!         STDOUT.flush()
          return
      
***************
*** 296,301 ****
          unittest.TestResult.startTest(self, test)
  
!         print test.id()
!         sys.stdout.flush()
  
          self.num_tests_run += 1
--- 301,306 ----
          unittest.TestResult.startTest(self, test)
  
!         STDOUT.write('%s\n' % test.id())
!         STDOUT.flush()
  
          self.num_tests_run += 1
***************
*** 314,320 ****
                                       self.num_tests,
                                       )
!         print progress_line
          self._outputSeparator('End progress')
!         sys.stdout.flush()
  
          return
--- 319,327 ----
                                       self.num_tests,
                                       )
!         STDOUT.write(progress_line)
!         STDOUT.write('\n')
!         
          self._outputSeparator('End progress')
!         STDOUT.flush()
  
          return
***************
*** 324,340 ****
  
          self._outputSeparator('Start results')
!         print 'ok'
          self._outputSeparator('End results')
!         sys.stdout.flush()
          return
      
      def addError(self, test, err):
          unittest.TestResult.addError(self, test, err)
!         print self._exc_info_to_string(err, test)
  
          self._outputSeparator('Start results')
!         print 'ERROR in', test.id()
          self._outputSeparator('End results')
!         sys.stdout.flush()
          return
  
--- 331,348 ----
  
          self._outputSeparator('Start results')
!         STDOUT.write('ok\n')
          self._outputSeparator('End results')
!         STDOUT.flush()
          return
      
      def addError(self, test, err):
          unittest.TestResult.addError(self, test, err)
!         STDOUT.write(self._exc_info_to_string(err, test))
!         STDOUT.write('\n')
  
          self._outputSeparator('Start results')
!         STDOUT.write('ERROR in %s\n' % test.id())
          self._outputSeparator('End results')
!         STDOUT.flush()
          return
  
***************
*** 342,351 ****
          unittest.TestResult.addFailure(self, test, err)
  
!         print self._exc_info_to_string(err, test)
  
          self._outputSeparator('Start results')
!         print 'FAIL in', test.id()
          self._outputSeparator('End results')
!         sys.stdout.flush()
          return
  
--- 350,359 ----
          unittest.TestResult.addFailure(self, test, err)
  
!         STDOUT.write(self._exc_info_to_string(err, test))
  
          self._outputSeparator('Start results')
!         STDOUT.write('FAIL in %s\n' % test.id())
          self._outputSeparator('End results')
!         STDOUT.flush()
          return
  
***************
*** 357,366 ****
          num_errors = len(self.errors)
          
!         print 'Failures: %d' % num_failures
!         print 'Errors: %d' % num_errors
          successes = (self.num_tests - (num_failures + num_errors))
!         print 'Successes: %d' % successes
!         print 'Tests: %d' % self.num_tests_run
!         print 'Elapsed time (sec): %.3f' % elapsed_time
  
          if num_failures or num_errors:
--- 365,374 ----
          num_errors = len(self.errors)
          
!         STDOUT.write('Failures: %d\n' % num_failures)
!         STDOUT.write('Errors: %d\n' % num_errors)
          successes = (self.num_tests - (num_failures + num_errors))
!         STDOUT.write('Successes: %d\n' % successes)
!         STDOUT.write('Tests: %d\n' % self.num_tests_run)
!         STDOUT.write('Elapsed time (sec): %.3f\n' % elapsed_time)
  
          if num_failures or num_errors:
***************
*** 369,376 ****
              status = 'OK'
  
!         print 'Status: %s' % status
          
          self._outputSeparator('End summary')
!         sys.stdout.flush()
          return
      
--- 377,384 ----
              status = 'OK'
  
!         STDOUT.write('Status: %s\n' % status)
          
          self._outputSeparator('End summary')
!         STDOUT.flush()
          return