Title: [128386] trunk/Tools
- Revision
- 128386
- Author
- [email protected]
- Date
- 2012-09-12 17:13:06 -0700 (Wed, 12 Sep 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128385 => 128386)
--- trunk/Tools/ChangeLog 2012-09-13 00:09:32 UTC (rev 128385)
+++ trunk/Tools/ChangeLog 2012-09-13 00:13:06 UTC (rev 128386)
@@ -1,5 +1,23 @@
2012-09-12 Dirk Pranke <[email protected]>
+ 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 <[email protected]>
+
remove unused testexpectations editing code from webkitpy, garden-o-matic
https://bugs.webkit.org/show_bug.cgi?id=96562
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py (128385 => 128386)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2012-09-13 00:09:32 UTC (rev 128385)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2012-09-13 00:13:06 UTC (rev 128386)
@@ -207,6 +207,11 @@
@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.
The format of a test expectation line is:
@@ -246,6 +251,11 @@
return expectation_line
@classmethod
+ def _tokenize_line_using_new_format(cls, filename, expectation_string, line_number):
+ # FIXME: implement :).
+ raise NotImplementedError
+
+ @classmethod
def _split_space_separated(cls, space_separated_string):
"""Splits a space-separated string into an array."""
return [part.strip() for part in space_separated_string.strip().split(' ')]
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
