Title: [148353] trunk/Tools
- Revision
- 148353
- Author
- [email protected]
- Date
- 2013-04-13 01:16:35 -0700 (Sat, 13 Apr 2013)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (148352 => 148353)
--- trunk/Tools/ChangeLog 2013-04-13 08:02:31 UTC (rev 148352)
+++ trunk/Tools/ChangeLog 2013-04-13 08:16:35 UTC (rev 148353)
@@ -1,5 +1,22 @@
2013-04-13 Ryosuke Niwa <[email protected]>
+ 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 <[email protected]>
+
Remove more Chromium specific code from webkitpy
https://bugs.webkit.org/show_bug.cgi?id=114552
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py (148352 => 148353)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py 2013-04-13 08:02:31 UTC (rev 148352)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py 2013-04-13 08:16:35 UTC (rev 148353)
@@ -32,7 +32,8 @@
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 @@
# 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",
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py (148352 => 148353)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py 2013-04-13 08:02:31 UTC (rev 148352)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py 2013-04-13 08:16:35 UTC (rev 148353)
@@ -150,7 +150,7 @@
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
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py (148352 => 148353)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py 2013-04-13 08:02:31 UTC (rev 148352)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py 2013-04-13 08:16:35 UTC (rev 148353)
@@ -91,7 +91,7 @@
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 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
