Changeset 91311 in webkit

Timestamp:

Jul 19, 2011 3:44:56 PM (13 years ago)

Author:

Dimitri Glazkov

Message:

Store line number on TestExpectationLine.
​https://bugs.webkit.org/show_bug.cgi?id=64800

Reviewed by Adam Barth.

• Scripts/webkitpy/layout_tests/models/test_expectations.py: Refactored to store line number on TestExpectationLine instances.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/models/test_expectations.py (modified) (15 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-19  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Store line number on TestExpectationLine.
+        https://bugs.webkit.org/show_bug.cgi?id=64800
+
+        Reviewed by Adam Barth.
+
+        * Scripts/webkitpy/layout_tests/models/test_expectations.py: Refactored to store line number on TestExpectationLine instances.
+
 2011-07-19  Ojan Vafai  <ojan@chromium.org>
 

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

@@ -269 +269 @@
 
     @classmethod
-    def tokenize(cls, expectation_string):
+    def tokenize(cls, expectation_string, line_number=None):
         """Tokenizes a line from test_expectations.txt and returns an unparsed TestExpectationLine instance.
 
@@ -280 +280 @@
         """
         expectation_line = TestExpectationLine()
+        expectation_line.line_number = line_number
         comment_index = expectation_string.find("//")
         if comment_index == -1:
@@ -311 +312 @@
         """Returns a list of TestExpectationLines, one for each line in expectations_string."""
         expectation_lines = []
+        line_number = 0
         for line in expectations_string.split("\n"):
-            expectation_lines.append(cls.tokenize(line))
+            line_number += 1
+            expectation_lines.append(cls.tokenize(line, line_number))
         return expectation_lines
 
@@ -327 +330 @@
     def __init__(self):
         """Initializes a blank-line equivalent of an expectation."""
+        self.line_number = None
         self.name = None
         self.path = None
@@ -366 +370 @@
         self._test_to_modifiers = {}
 
-        # Maps a test to a tuple of line number and TestExpectationLine instance.
+        # Maps a test to a TestExpectationLine instance.
         self._test_to_expectation_line = {}
 
@@ -420 +424 @@
         return self._test_to_expectations[test]
 
-    def add_expectation_line(self, lineno, expectation_line, overrides_allowed):
+    def add_expectation_line(self, expectation_line, overrides_allowed):
         """Returns a list of errors, encountered while matching modifiers."""
 
@@ -427 +431 @@
 
         for test in expectation_line.matching_tests:
-            if self._already_seen_better_match(test, expectation_line, lineno, overrides_allowed):
+            if self._already_seen_better_match(test, expectation_line, overrides_allowed):
                 continue
 
             self._clear_expectations_for_test(test, expectation_line)
-            self._test_to_expectation_line[test] = (expectation_line, lineno)
+            self._test_to_expectation_line[test] = expectation_line
             self._add_test(test, expectation_line, overrides_allowed)
 
@@ -484 +488 @@
             self._remove_from_sets(test, self._result_type_to_tests)
 
-        self._test_to_expectation_line[test] = (expectation_line, 0)
+        self._test_to_expectation_line[test] = expectation_line
 
     def _remove_from_sets(self, test, dict):
@@ -496 +500 @@
                 set_of_tests.remove(test)
 
-    def _already_seen_better_match(self, test, expectation_line, lineno, overrides_allowed):
+    def _already_seen_better_match(self, test, expectation_line, overrides_allowed):
         """Returns whether we've seen a better match already in the file.
 
@@ -507 +511 @@
             return False
 
-        prev_expectation_line, prev_lineno = self._test_to_expectation_line[test]
+        prev_expectation_line = self._test_to_expectation_line[test]
 
         if len(prev_expectation_line.path) > len(expectation_line.path):
@@ -545 +549 @@
 
         if prev_expectation_line.specificity < expectation_line.specificity:
-            expectation_line.errors.append('More specific entry on line %d overrides line %d' % (lineno, prev_lineno))
+            expectation_line.errors.append('More specific entry on line %d overrides line %d' % (expectation_line.line_number, prev_expectation_line.line_number))
             # FIXME: return False if we want more specific to win.
             return True
 
-        expectation_line.errors.append('More specific entry on line %d overrides line %d' % (prev_lineno, lineno))
+        expectation_line.errors.append('More specific entry on line %d overrides line %d' % (prev_expectation_line.line_number, expectation_line.line_number))
         return True
 
@@ -746 +750 @@
         errors = []
         warnings = []
-        lineno = 0
         for expectation in self._expectations:
-            lineno += 1
             for error in expectation.errors:
-                errors.append("Line:%s %s %s" % (lineno, error, expectation.name if expectation.expectations else expectation.comment))
+                errors.append("Line:%s %s %s" % (expectation.line_number, error, expectation.name if expectation.expectations else expectation.comment))
             for warning in expectation.warnings:
-                warnings.append("Line:%s %s %s" % (lineno, warning, expectation.name if expectation.expectations else expectation.comment))
+                warnings.append("Line:%s %s %s" % (expectation.line_number, warning, expectation.name if expectation.expectations else expectation.comment))
 
         if len(errors) or len(warnings):
@@ -773 +775 @@
             for test in self._full_test_list:
                 if not self._model.has_test(test):
-                    self._model.add_expectation_line(0, TestExpectationLine.create_passing_expectation(test), overrides_allowed=False)
+                    self._model.add_expectation_line(TestExpectationLine.create_passing_expectation(test), overrides_allowed=False)
 
     def get_expectations_json_for_all_platforms(self):
@@ -797 +799 @@
 
     def _add_expectations(self, expectation_list, overrides_allowed):
-        lineno = 0
         for expectation_line in expectation_list:
-            lineno += 1
             if not expectation_line.expectations:
                 continue
@@ -808 +808 @@
 
             self._parser.parse(expectation_line)
-            self._model.add_expectation_line(lineno, expectation_line, overrides_allowed)
+            self._model.add_expectation_line(expectation_line, overrides_allowed)