Changeset 128386 in webkit

Timestamp:

Sep 12, 2012 5:13:06 PM (12 years ago)

Author:

dpranke@chromium.org

Message:

refactor TestExpectations tokenization slightly in preparation for the new syntax
​https://bugs.webkit.org/show_bug.cgi?id=96564

Reviewed by Ojan Vafai.

This change changes how we will tokenize/lex the
TestExpectations files, in preparation for supporting both the
old syntax and the new one. This change by itself should be a
no-op.

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

(TestExpectationParser._tokenize_line):
(TestExpectationParser):
(TestExpectationParser._tokenize_line_using_old_format):
(TestExpectationParser._tokenize_line_using_new_format):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-12  Dirk Pranke  <dpranke@chromium.org>
+
+        refactor TestExpectations tokenization slightly in preparation for the new syntax
+        https://bugs.webkit.org/show_bug.cgi?id=96564
+
+        Reviewed by Ojan Vafai.
+
+        This change changes how we will tokenize/lex the
+        TestExpectations files, in preparation for supporting both the
+        old syntax and the new one. This change by itself should be a
+        no-op.
+
+        * Scripts/webkitpy/layout_tests/models/test_expectations.py:
+        (TestExpectationParser._tokenize_line):
+        (TestExpectationParser):
+        (TestExpectationParser._tokenize_line_using_old_format):
+        (TestExpectationParser._tokenize_line_using_new_format):
+
 2012-09-12  Dirk Pranke  <dpranke@chromium.org>
 

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

@@ -208 +208 @@
     @classmethod
     def _tokenize_line(cls, filename, expectation_string, line_number):
+        # FIXME: Add in support for the new format as well.
+        return cls._tokenize_line_using_old_format(filename, expectation_string, line_number)
+
+    @classmethod
+    def _tokenize_line_using_old_format(cls, filename, expectation_string, line_number):
         """Tokenizes a line from TestExpectations and returns an unparsed TestExpectationLine instance.
 
@@ -245 +250 @@
 
         return expectation_line
+
+    @classmethod
+    def _tokenize_line_using_new_format(cls, filename, expectation_string, line_number):
+        # FIXME: implement :).
+        raise NotImplementedError
 
     @classmethod