Changeset 103547 in webkit

Timestamp:

Dec 22, 2011 8:57:08 AM (12 years ago)

Author:

Adam Roben

Message:

Add a --xml flag to test-webkitpy

test-webkitpy --xml will, in addition to providing the standard text output on stdout, write
JUnit-style XML files to a test-webkitpy-xml-reports subdirectory in the working directory.
This is useful for working with tools that consume JUnit-style XML files.

Fixes <​http://webkit.org/b/75090> Would like a way to generate JUnit-style XML files when
running test-webkitpy

Reviewed by Darin Adler.

• Scripts/webkitpy/test/main.py:

(Tester.run_tests): If the --xml flag is passed, create an XMLTestRunner and pass it to
unittest.main(). Otherwise pass no test runner so that unittest will choose its own default.

• Scripts/webkitpy/thirdparty/init.py:

(AutoinstallImportHook.find_module):
(AutoinstallImportHook._install_xmlrunner):
Added code to install unittest-xml-reporting as webkitpy.thirdparty.autoinstalled.xmlrunner.
This change is untested because it's basically impossible to get a test to pass when --xml
is passed to test-webkitpy (because xmlrunner will already have been imported by the time
the test runs).

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/test/main.py (modified) (2 diffs)
• Scripts/webkitpy/thirdparty/__init__.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-12-22  Adam Roben  <aroben@apple.com>
+
+        Add a --xml flag to test-webkitpy
+
+        test-webkitpy --xml will, in addition to providing the standard text output on stdout, write
+        JUnit-style XML files to a test-webkitpy-xml-reports subdirectory in the working directory.
+        This is useful for working with tools that consume JUnit-style XML files.
+
+        Fixes <http://webkit.org/b/75090> Would like a way to generate JUnit-style XML files when
+        running test-webkitpy
+
+        Reviewed by Darin Adler.
+
+        * Scripts/webkitpy/test/main.py:
+        (Tester.run_tests): If the --xml flag is passed, create an XMLTestRunner and pass it to
+        unittest.main(). Otherwise pass no test runner so that unittest will choose its own default.
+
+        * Scripts/webkitpy/thirdparty/__init__.py:
+        (AutoinstallImportHook.find_module):
+        (AutoinstallImportHook._install_xmlrunner):
+        Added code to install unittest-xml-reporting as webkitpy.thirdparty.autoinstalled.xmlrunner.
+        This change is untested because it's basically impossible to get a test to pass when --xml
+        is passed to test-webkitpy (because xmlrunner will already have been imported by the time
+        the test runs).
+
 2011-12-22  David Kilzer  <ddkilzer@apple.com>
 

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

@@ -112 +112 @@
             sys.path.extend(set(os.path.dirname(path) for path in external_package_paths))
 
+        if '--xml' in sys.argv:
+            sys.argv.remove('--xml')
+            from webkitpy.thirdparty.autoinstalled.xmlrunner import XMLTestRunner
+            test_runner = XMLTestRunner(output='test-webkitpy-xml-reports')
+        else:
+            test_runner = None
+
         if len(sys_argv) > 1 and not sys_argv[-1].startswith("-"):
             # Then explicit modules or test names were provided, which
             # the unittest module is equipped to handle.
-            unittest.main(argv=sys_argv, module=None)
+            unittest.main(argv=sys_argv, module=None, testRunner=test_runner)
             # No need to return since unitttest.main() exits.
 
@@ -167 +174 @@
         # this module.)  See the loadTestsFromName() method of the
         # unittest.TestLoader class for more details on this parameter.
-        unittest.main(argv=sys_argv, module=None)
+        unittest.main(argv=sys_argv, module=None, testRunner=test_runner)

trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py

@@ -83 +83 @@
         elif '.buildbot' in fullname:
             self._install_buildbot()
+        elif '.xmlrunner' in fullname:
+            self._install_xmlrunner()
 
     def _install_mechanize(self):
@@ -129 +131 @@
                           url_subpath="pywebsocket-0.7/src/mod_pywebsocket")
 
+    def _install_xmlrunner(self):
+        self._install("http://pypi.python.org/packages/source/u/unittest-xml-reporting/unittest-xml-reporting-1.0.3.tar.gz#md5=cebf83281b0753b5d42bad38c91fd4d6",
+                      "unittest-xml-reporting-1.0.3/src/xmlrunner")
+
     def _install(self, url, url_subpath):
         installer = AutoInstaller(target_dir=_AUTOINSTALLED_DIR)