remove support for junit-style xml output from test-webkitpy
authordpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 29 Mar 2012 23:16:33 +0000 (23:16 +0000)
committerdpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 29 Mar 2012 23:16:33 +0000 (23:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=82279

Reviewed by Eric Seidel.

This was added when we were looking into integrating w/ Jenkins
rather than buildbot, but I believe that project got shelved, so
this is unused. We can always add it back in later as necessary.

* Scripts/webkitpy/test/main.py:
(Tester._parse_args):
(Tester._run_tests):
* Scritps/webkitpy/thirdparty/__init__.py:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@112598 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/test/main.py
Tools/Scripts/webkitpy/thirdparty/__init__.py

index 64bd1dfe74f3d396253c3834235f8486573ac72b..0761a93d420dc42ecd1506d043cb08865a901f2f 100644 (file)
@@ -1,3 +1,19 @@
+2012-03-29  Dirk Pranke  <dpranke@chromium.org>
+
+        remove support for junit-style xml output from test-webkitpy
+        https://bugs.webkit.org/show_bug.cgi?id=82279
+
+        Reviewed by Eric Seidel.
+
+        This was added when we were looking into integrating w/ Jenkins
+        rather than buildbot, but I believe that project got shelved, so
+        this is unused. We can always add it back in later as necessary.
+
+        * Scripts/webkitpy/test/main.py:
+        (Tester._parse_args):
+        (Tester._run_tests):
+        * Scritps/webkitpy/thirdparty/__init__.py:
+
 2012-03-29  Dirk Pranke  <dpranke@chromium.org>
 
         new-run-webkit-tests: crashes when it fails to decode a stack trace
index 1035201ac209ec0031b42e7d8dc3b1f2c1479f7b..af3123a01484fda2b32351c9dfa3369aff7bd031 100644 (file)
@@ -55,8 +55,6 @@ class Tester(object):
                           help='run quietly (errors, warnings, and progress only)'),
         parser.add_option('-t', '--timing', action='store_true', default=False,
                           help='display per-test execution time (implies --verbose)'),
-        parser.add_option('-x', '--xml', action='store_true', default=False,
-                          help='output xUnit-style XML output')
         parser.add_option('-v', '--verbose', action='count', default=0,
                           help='verbose output (specify once for individual test results, twice for debug messages)')
         parser.add_option('--skip-integrationtests', action='store_true', default=False,
@@ -171,11 +169,7 @@ class Tester(object):
             suites.append(loader.loadTestsFromName(name, None))
 
         test_suite = unittest.TestSuite(suites)
-        if self._options.xml:
-            from webkitpy.thirdparty.autoinstalled.xmlrunner import XMLTestRunner
-            test_runner = XMLTestRunner(output='test-webkitpy-xml-reports')
-        else:
-            test_runner = TestRunner(self.stream, self._options, loader)
+        test_runner = TestRunner(self.stream, self._options, loader)
 
         _log.debug("Running the tests.")
         result = test_runner.run(test_suite)
index 2c39de6cc11e2390aea24ea479a0f046e52b0769..ed36f9ccf1332fd5c7de02609aa671b34834f73f 100644 (file)
@@ -84,8 +84,6 @@ class AutoinstallImportHook(object):
             self._install_pywebsocket()
         elif '.buildbot' in fullname:
             self._install_buildbot()
-        elif '.xmlrunner' in fullname:
-            self._install_xmlrunner()
 
     def _install_mechanize(self):
         self._install("http://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz",
@@ -136,10 +134,6 @@ class AutoinstallImportHook(object):
         installer.install(url="http://pywebsocket.googlecode.com/files/mod_pywebsocket-0.7.2.tar.gz",
                           url_subpath="pywebsocket-0.7.2/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)
         installer.install(url=url, url_subpath=url_subpath)