Rename JSONResultsGeneratorBase to JSONResultsGenerator
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 13 Apr 2013 08:16:35 +0000 (08:16 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 13 Apr 2013 08:16:35 +0000 (08:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=114553

Reviewed by Philippe Normand.

Renamed now that we've got rid of the old JSONResultsGenerator in r148352.

* Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py:
(JSONLayoutResultsGenerator):
* Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
(JSONResultsGenerator):
* Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py:
(JSONGeneratorTest._test_json_generation):
(JSONGeneratorTest._verify_json_results):

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

Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py
Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py
Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py

index d91b1a80c3de508a090a4a3028bf46f238405602..607880c06ac7686e9338de9b5a6dadcbfe2a268e 100644 (file)
@@ -1,3 +1,20 @@
+2013-04-13  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Rename JSONResultsGeneratorBase to JSONResultsGenerator
+        https://bugs.webkit.org/show_bug.cgi?id=114553
+
+        Reviewed by Philippe Normand.
+
+        Renamed now that we've got rid of the old JSONResultsGenerator in r148352.
+
+        * Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py:
+        (JSONLayoutResultsGenerator):
+        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
+        (JSONResultsGenerator):
+        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py:
+        (JSONGeneratorTest._test_json_generation):
+        (JSONGeneratorTest._verify_json_results):
+
 2013-04-13  Ryosuke Niwa  <rniwa@webkit.org>
 
         Remove more Chromium specific code from webkitpy
index a635f6e655b3b4409d1ea0801f8910795535a960..715497de1b07831934ddebe37128e8abc27040e4 100644 (file)
@@ -32,7 +32,8 @@ from webkitpy.layout_tests.layout_package import json_results_generator
 from webkitpy.layout_tests.models import test_expectations
 from webkitpy.layout_tests.models import test_failures
 
-class JSONLayoutResultsGenerator(json_results_generator.JSONResultsGeneratorBase):
+
+class JSONLayoutResultsGenerator(json_results_generator.JSONResultsGenerator):
     """A JSON results generator for layout tests."""
 
     LAYOUT_TESTS_PATH = "LayoutTests"
@@ -40,8 +41,8 @@ class JSONLayoutResultsGenerator(json_results_generator.JSONResultsGeneratorBase
     # Additional JSON fields.
     WONTFIX = "wontfixCounts"
 
-    FAILURE_TO_CHAR = {test_expectations.PASS: json_results_generator.JSONResultsGeneratorBase.PASS_RESULT,
-                       test_expectations.SKIP: json_results_generator.JSONResultsGeneratorBase.SKIP_RESULT,
+    FAILURE_TO_CHAR = {test_expectations.PASS: json_results_generator.JSONResultsGenerator.PASS_RESULT,
+                       test_expectations.SKIP: json_results_generator.JSONResultsGenerator.SKIP_RESULT,
                        test_expectations.CRASH: "C",
                        test_expectations.TIMEOUT: "T",
                        test_expectations.IMAGE: "I",
index 252572bbfb28f024b7cdfc3c9d0288b600aa1f3e..a2c2e0b6389bf1f00ce3b4444aab7a2467fad2db 100644 (file)
@@ -150,7 +150,7 @@ class TestResult(object):
         return self.failed or self.modifier == self.DISABLED
 
 
-class JSONResultsGeneratorBase(object):
+class JSONResultsGenerator(object):
     """A JSON results generator for generic tests."""
 
     MAX_NUMBER_OF_BUILD_RESULTS_TO_LOG = 750
index ffd7f20910d503ebe39b8d18c36be61d81ff2d12..14270027d87192d3860e87dc47c6f65d0d6ecc0c 100644 (file)
@@ -91,7 +91,7 @@ class JSONGeneratorTest(unittest.TestCase):
         host = MockHost()
         port = Mock()
         port._filesystem = host.filesystem
-        generator = json_results_generator.JSONResultsGeneratorBase(port,
+        generator = json_results_generator.JSONResultsGenerator(port,
             self.builder_name, self.build_name, self.build_number,
             '',
             None,   # don't fetch past json results archive
@@ -121,7 +121,7 @@ class JSONGeneratorTest(unittest.TestCase):
                              fixable_count,
                              json, num_runs):
         # Aliasing to a short name for better access to its constants.
-        JRG = json_results_generator.JSONResultsGeneratorBase
+        JRG = json_results_generator.JSONResultsGenerator
 
         self.assertIn(JRG.VERSION_KEY, json)
         self.assertIn(self.builder_name, json)