Changeset 90538 in webkit

Timestamp:

Jul 6, 2011 9:42:54 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-07-06 Adam Barth <​abarth@webkit.org>

Cleanup result_summary.py
​https://bugs.webkit.org/show_bug.cgi?id=64057

Reviewed by Eric Seidel.

This class had a bunch of out-of-date docstrings that no longer make
any sense.

• Scripts/webkitpy/layout_tests/models/result_summary.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/models/result_summary.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-06  Adam Barth  <abarth@webkit.org>
+
+        Cleanup result_summary.py
+        https://bugs.webkit.org/show_bug.cgi?id=64057
+
+        Reviewed by Eric Seidel.
+
+        This class had a bunch of out-of-date docstrings that no longer make
+        any sense.
+
+        * Scripts/webkitpy/layout_tests/models/result_summary.py:
+
 2011-07-06  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/models/result_summary.py

@@ -1 @@
-#!/usr/bin/env python
 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Szeged
@@ -29 +28 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-"""Run layout tests."""
-
-import logging
-
-from webkitpy.layout_tests.models import test_expectations
-from webkitpy.layout_tests.models.test_expectations import TestExpectations
-
-
-_log = logging.getLogger(__name__)
+from webkitpy.layout_tests.models.test_expectations import TestExpectations, SKIP, CRASH, TIMEOUT
 
 
 class ResultSummary(object):
-    """A class for partitioning the test results we get into buckets.
-
-    This class is basically a glorified struct and it's private to this file
-    so we don't bother with any information hiding."""
-
     def __init__(self, expectations, test_files):
         self.total = len(test_files)
@@ -60 +46 @@
         self.unexpected_results = {}
         self.failures = {}
-        self.tests_by_expectation[test_expectations.SKIP] = set()
+        self.tests_by_expectation[SKIP] = set()
         for expectation in TestExpectations.EXPECTATIONS.values():
             self.tests_by_expectation[expectation] = set()
@@ -66 +52 @@
             self.tests_by_timeline[timeline] = expectations.get_tests_with_timeline(timeline)
 
-    def add(self, result, expected):
-        """Add a TestResult into the appropriate bin.
-
-        Args:
-          result: TestResult
-          expected: whether the result was what we expected it to be.
-        """
-
-        self.tests_by_expectation[result.type].add(result.test_name)
-        self.results[result.test_name] = result
+    def add(self, test_result, expected):
+        self.tests_by_expectation[test_result.type].add(test_result.test_name)
+        self.results[test_result.test_name] = test_result
         self.remaining -= 1
-        if len(result.failures):
-            self.failures[result.test_name] = result.failures
+        if len(test_result.failures):
+            self.failures[test_result.test_name] = test_result.failures
         if expected:
             self.expected += 1
         else:
-            self.unexpected_results[result.test_name] = result
+            self.unexpected_results[test_result.test_name] = test_result
             self.unexpected += 1
-            if len(result.failures):
+            if len(test_result.failures):
                 self.unexpected_failures += 1
-            if result.type == test_expectations.CRASH:
+            if test_result.type == CRASH:
                 self.unexpected_crashes += 1
-            elif result.type == test_expectations.TIMEOUT:
+            elif test_result.type == TIMEOUT:
                 self.unexpected_timeouts += 1