Title: [99469] trunk/Tools
- Revision
- 99469
- Author
- [email protected]
- Date
- 2011-11-07 13:20:10 -0800 (Mon, 07 Nov 2011)
Log Message
[NRWT] Parsing of test_expectations.txt should be agnostic to newline at end
https://bugs.webkit.org/show_bug.cgi?id=70912
Patch by Balazs Ankes <[email protected]> on 2011-11-07
Reviewed by Ojan Vafai.
* Scripts/webkitpy/layout_tests/port/webkit.py: Add newline at the end of test_expectations.txt.
* Scripts/webkitpy/layout_tests/port/webkit_unittest.py: Make up the test_test_expectations method for the updated webkit.py.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (99468 => 99469)
--- trunk/Tools/ChangeLog 2011-11-07 21:19:45 UTC (rev 99468)
+++ trunk/Tools/ChangeLog 2011-11-07 21:20:10 UTC (rev 99469)
@@ -1,3 +1,13 @@
+2011-11-07 Balazs Ankes <[email protected]>
+
+ [NRWT] Parsing of test_expectations.txt should be agnostic to newline at end
+ https://bugs.webkit.org/show_bug.cgi?id=70912
+
+ Reviewed by Ojan Vafai.
+
+ * Scripts/webkitpy/layout_tests/port/webkit.py: Add newline at the end of test_expectations.txt.
+ * Scripts/webkitpy/layout_tests/port/webkit_unittest.py: Make up the test_test_expectations method for the updated webkit.py.
+
2011-11-07 Eric Seidel <[email protected]>
new-run-webkit-tests: support --repeat-each feature from old-run-webkit-tests
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (99468 => 99469)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-11-07 21:19:45 UTC (rev 99468)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-11-07 21:20:10 UTC (rev 99469)
@@ -356,7 +356,7 @@
expectations_path = self.path_to_test_expectations_file()
if self._filesystem.exists(expectations_path):
_log.debug("Using test_expectations.txt: %s" % expectations_path)
- expectations = self._filesystem.read_text_file(expectations_path) + expectations
+ expectations = self._filesystem.read_text_file(expectations_path) + '\n' + expectations
return expectations
def _skipped_list_as_expectations(self):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py (99468 => 99469)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2011-11-07 21:19:45 UTC (rev 99468)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2011-11-07 21:20:10 UTC (rev 99469)
@@ -163,10 +163,21 @@
mock_fs = MockFileSystem(files)
port = TestWebKitPort(filesystem=mock_fs)
self.assertEqual(port.test_expectations(),
+ """BUG_TESTEXPECTATIONS SKIP : fast/html/article-element.html = FAIL\n
+BUG_SKIPPED SKIP : fast/html/keygen.html = FAIL
+BUG_SKIPPED SKIP : media = FAIL""")
+ files = {
+ '/mock-checkout/LayoutTests/platform/testwebkitport/test_expectations.txt': 'BUG_TESTEXPECTATIONS SKIP : fast/html/article-element.html = FAIL',
+ '/mock-checkout/LayoutTests/platform/testwebkitport/Skipped': 'fast/html/keygen.html',
+ }
+ mock_fs = MockFileSystem(files)
+ port = TestWebKitPort(filesystem=mock_fs)
+ self.assertEqual(port.test_expectations(),
"""BUG_TESTEXPECTATIONS SKIP : fast/html/article-element.html = FAIL
BUG_SKIPPED SKIP : fast/html/keygen.html = FAIL
BUG_SKIPPED SKIP : media = FAIL""")
+
def test_build_driver(self):
output = OutputCapture()
port = TestWebKitPort()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
