Changeset 112298 in webkit

Timestamp:

Mar 27, 2012 12:15:53 PM (12 years ago)

Author:

dpranke@chromium.org

Message:

test-webkitpy: prepare for better test run output
​https://bugs.webkit.org/show_bug.cgi?id=82290

Reviewed by Adam Barth.

This code basically re-implements the output of the TextTestRunner default
runner code from unittest, although the implementation is quite
different, in preparation for changing the test output to be
metered and possibly running in parallel.

The output is almost identical to before, except that instead of
logging "test_regular (webkitpy.main.RunnerTest) passed" we log
"webkitpy.main.RunnerTest.test_regular passed". It has always
annoyed me that they invert the names to be harder to read and
so that you can't copy & paste back to the input for
test-webkitpy.

This patch is provided to add a skeleton for unit tests and for
comparison to an upcoming patch that will actually add new
functionality.

• Scripts/webkitpy/test/main.py:

(Tester.init):
(Tester._configure_logging):
(Tester._run_tests):

• Scripts/webkitpy/test/runner.py: Added.

(TestRunner):
(TestRunner.init):
(TestRunner.test_name):
(TestRunner.all_test_names):
(TestRunner.run):
(TestRunner.write_result):
(TestRunner.write_summary):

• Scripts/webkitpy/test/runner_unittest.py: Added.

(FakeModuleSuite):
(FakeModuleSuite.init):
(FakeModuleSuite.str):
(FakeModuleSuite.run):
(FakeTopSuite):
(FakeTopSuite.init):
(FakeLoader):
(FakeLoader.init):
(FakeLoader.top_suite):
(FakeLoader.loadTestsFromName):
(RunnerTest):
(RunnerTest.test_regular):
(RunnerTest.test_verbose):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/test/main.py (modified) (7 diffs)
• Scripts/webkitpy/test/runner.py (added)
• Scripts/webkitpy/test/runner_unittest.py (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-27  Dirk Pranke  <dpranke@chromium.org>
+
+        test-webkitpy: prepare for better test run output
+        https://bugs.webkit.org/show_bug.cgi?id=82290
+
+        Reviewed by Adam Barth.
+
+        This code basically re-implements the output of the TextTestRunner default
+        runner code from unittest, although the implementation is quite
+        different, in preparation for changing the test output to be
+        metered and possibly running in parallel.
+
+        The output is almost identical to before, except that instead of
+        logging "test_regular (webkitpy.main.RunnerTest) passed" we log
+        "webkitpy.main.RunnerTest.test_regular passed". It has always
+        annoyed me that they invert the names to be harder to read and
+        so that you can't copy & paste back to the input for
+        test-webkitpy.
+
+        This patch is provided to add a skeleton for unit tests and for
+        comparison to an upcoming patch that will actually add new
+        functionality.
+
+        * Scripts/webkitpy/test/main.py:
+        (Tester.__init__):
+        (Tester._configure_logging):
+        (Tester._run_tests):
+        * Scripts/webkitpy/test/runner.py: Added.
+        (TestRunner):
+        (TestRunner.__init__):
+        (TestRunner.test_name):
+        (TestRunner.all_test_names):
+        (TestRunner.run):
+        (TestRunner.write_result):
+        (TestRunner.write_summary):
+        * Scripts/webkitpy/test/runner_unittest.py: Added.
+        (FakeModuleSuite):
+        (FakeModuleSuite.__init__):
+        (FakeModuleSuite.__str__):
+        (FakeModuleSuite.run):
+        (FakeTopSuite):
+        (FakeTopSuite.__init__):
+        (FakeLoader):
+        (FakeLoader.__init__):
+        (FakeLoader.top_suite):
+        (FakeLoader.loadTestsFromName):
+        (RunnerTest):
+        (RunnerTest.test_regular):
+        (RunnerTest.test_verbose):
+
 2012-03-27  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/Tools/Scripts/webkitpy/test/main.py

@@ -33 +33 @@
 from webkitpy.common.system.filesystem import FileSystem
 from webkitpy.test.test_finder import TestFinder
+from webkitpy.test.runner import TestRunner
 
 _log = logging.getLogger(__name__)
@@ -41 +42 @@
         self._verbosity = 1
         self.finder = TestFinder(filesystem or FileSystem())
+        self.stream = sys.stderr
 
     def add_tree(self, top_directory, starting_subdirectory=None):
@@ -93 +95 @@
         logging level as described below.
         """
-        handler = logging.StreamHandler(sys.stderr)
+        handler = logging.StreamHandler(self.stream)
         # We constrain the level on the handler rather than on the root
         # logger itself.  This is probably better because the handler is
@@ -143 +145 @@
         return self._run_tests(names)
 
-    def _run_tests(self, args):
+    def _run_tests(self, names):
         if self._options.coverage:
             try:
@@ -160 +162 @@
         loader = unittest.defaultTestLoader
         suites = []
-        for name in args:
+        for name in names:
             if self.finder.is_module(name):
-                # import modules explicitly before loading their tests because
-                # loadTestsFromName() produces lousy error messages for bad modules.
+                # if we failed to load a name and it looks like a module,
+                # try importing it directly, because loadTestsFromName()
+                # produces lousy error messages for bad modules.
                 try:
                     __import__(name)
@@ -170 +173 @@
                     self._log_exception()
                     return False
+
             suites.append(loader.loadTestsFromName(name, None))
 
@@ -177 +181 @@
             test_runner = XMLTestRunner(output='test-webkitpy-xml-reports')
         else:
-            test_runner = unittest.TextTestRunner(verbosity=self._verbosity)
+            test_runner = TestRunner(self.stream, self._options, loader)
 
         _log.debug("Running the tests.")