Revert 56951 - Produce gtest style output with pyauto....

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
@@ skipping 1330 matching lines @@
 
   def __del__(self):
     # python unittest module is setup such that the suite gets deleted before
     # the test cases, which is odd because our test cases depend on
     # initializtions like exitmanager, autorelease pool provided by the
     # suite. Forcibly delete the test cases before the suite.
     del self._tests
     pyautolib.PyUITestSuiteBase.__del__(self)
 
 
-class _GTestTextTestResult(unittest._TextTestResult):
-  """A test result class that can print formatted text results to a stream.
-
-  Results printed in conformance with gtest output format, like:
-  [ RUN        ] autofill.AutoFillTest.testAutofillInvalid: "test desc."
-  [         OK ] autofill.AutoFillTest.testAutofillInvalid
-  [ RUN        ] autofill.AutoFillTest.testFillProfile: "test desc."
-  [         OK ] autofill.AutoFillTest.testFillProfile
-  [ RUN        ] autofill.AutoFillTest.testFillProfileCrazyCharacters: "Test."
-  [         OK ] autofill.AutoFillTest.testFillProfileCrazyCharacters
-  """
-  def __init__(self, stream, descriptions, verbosity):
-    unittest._TextTestResult.__init__(self, stream, descriptions, verbosity)
-
-  def _GetTestURI(self, test):
-    return '%s.%s' % (unittest._strclass(test.__class__), test._testMethodName)
-
-  def getDescription(self, test):
-    return '%s: "%s"' % (self._GetTestURI(test), test.shortDescription())
-
-  def startTest(self, test):
-    unittest.TestResult.startTest(self, test)
-    self.stream.writeln('[ RUN        ] %s' % self.getDescription(test))
-
-  def addSuccess(self, test):
-    unittest.TestResult.addSuccess(self, test)
-    self.stream.writeln('[         OK ] %s' % self._GetTestURI(test))
-
-  def addError(self, test, err):
-    unittest.TestResult.addError(self, test, err)
-    self.stream.writeln('[      ERROR ] %s' % self._GetTestURI(test))
-
-  def addFailure(self, test, err):
-    unittest.TestResult.addFailure(self, test, err)
-    self.stream.writeln('[     FAILED ] %s' % self._GetTestURI(test))
-
-
-class PyAutoTextTestRuner(unittest.TextTestRunner):
-  """Test Runner for PyAuto tests that displays results in textual format.
-
-  Results are displayed in conformance with gtest output.
-  """
-  def __init__(self, verbosity=1):
-    unittest.TextTestRunner.__init__(self,
-                                     stream=sys.stderr,
-                                     verbosity=verbosity)
-
-  def _makeResult(self):
-    return _GTestTextTestResult(self.stream, self.descriptions, self.verbosity)
-
-
 # Implementation inspired from unittest.main()
 class Main(object):
   """Main program for running PyAuto tests."""
 
   _options, _args = None, None
   _tests_filename = 'PYAUTO_TESTS'
   _platform_map = {
     'win32':  'win',
     'darwin': 'mac',
     'linux2': 'linux',
@@ skipping 207 matching lines @@
     # read values back out.
     chrome_flags += ' --dom-automation'
 
     suite_args.append('--extra-chrome-flags=%s' % chrome_flags)
     pyauto_suite = PyUITestSuite(suite_args)
     loaded_tests = self._LoadTests(self._args)
     pyauto_suite.addTests(loaded_tests)
     verbosity = 1
     if self._options.verbose:
       verbosity = 2
-    result = PyAutoTextTestRuner(verbosity=verbosity).run(pyauto_suite)
+    result = unittest.TextTestRunner(verbosity=verbosity).run(pyauto_suite)
     del loaded_tests  # Need to destroy test cases before the suite
     del pyauto_suite
     sys.exit(not result.wasSuccessful())
 
 
 if __name__ == '__main__':
   Main()