Index: Tools/Scripts/webkitpy/layout_tests/models/testharness_results_unittest.py |
diff --git a/Tools/Scripts/webkitpy/layout_tests/models/testharness_results_unittest.py b/Tools/Scripts/webkitpy/layout_tests/models/testharness_results_unittest.py |
index 6ec58cf1171d6229875fd3e70de949b629248211..b477662cc9cb26651a681e315ae3ad0a3802bc8e 100644 |
--- a/Tools/Scripts/webkitpy/layout_tests/models/testharness_results_unittest.py |
+++ b/Tools/Scripts/webkitpy/layout_tests/models/testharness_results_unittest.py |
@@ -15,11 +15,13 @@ class TestHarnessResultCheckerTest(unittest.TestCase): |
{'content': '', 'result': False}, |
{'content': ' ', 'result': False}, |
{'content': 'This is a testharness.js-based test.\nHarness: the test ran to completion.', 'result': True}, |
- {'content': '\n \r This is a testharness.js-based test. \n \r \n \rHarness: the test ran to completion. \n\n', 'result': True}, |
+ {'content': '\n \r This is a testharness.js-based test. \n \r \n \rHarness: the test ran to completion. \n\n', |
+ 'result': True}, |
{'content': ' This \nis a testharness.js-based test.\nHarness: the test ran to completion.', 'result': False}, |
{'content': 'This is a testharness.js-based test. Harness: the test ran to completion.', 'result': False}, |
{'content': 'This is a testharness.js-based test.\nFoo bar \n Harness: the test ran to completion.', 'result': True}, |
- {'content': 'This is a testharness.js-based test.\nFAIL: bah \n Harness: the test ran to completion.\n\n\n', 'result': True}, |
+ {'content': 'This is a testharness.js-based test.\nFAIL: bah \n Harness: the test ran to completion.\n\n\n', |
+ 'result': True}, |
] |
for data in test_data: |
@@ -29,17 +31,27 @@ class TestHarnessResultCheckerTest(unittest.TestCase): |
test_data = [ |
{'content': 'This is a testharness.js-based test.\n Harness: the test ran to completion.', 'result': True}, |
{'content': 'This is a testharness.js-based test.\n \n Harness: the test ran to completion.', 'result': False}, |
- {'content': 'This is a testharness.js-based test.\n PASS: foo bar \n Harness: the test ran to completion.', 'result': True}, |
- {'content': 'This is a testharness.js-based test.\n PASS: foo bar FAIL \n Harness: the test ran to completion.', 'result': True}, |
- {'content': 'This is a testharness.js-based test.\n PASS: foo bar \nFAIL \n Harness: the test ran to completion.', 'result': False}, |
- {'content': 'This is a testharness.js-based test.\n CONSOLE ERROR: BLAH \n Harness: the test ran to completion.', 'result': True}, |
+ {'content': 'This is a testharness.js-based test.\n PASS: foo bar \n Harness: the test ran to completion.', |
+ 'result': True}, |
+ {'content': 'This is a testharness.js-based test.\n PASS: foo bar FAIL \n Harness: the test ran to completion.', |
+ 'result': True}, |
+ {'content': 'This is a testharness.js-based test.\n PASS: foo bar \nFAIL \n Harness: the test ran to completion.', |
+ 'result': False}, |
+ {'content': 'This is a testharness.js-based test.\n CONSOLE ERROR: BLAH \n Harness: the test ran to completion.', |
+ 'result': True}, |
{'content': 'This is a testharness.js-based test.\n Foo bar \n Harness: the test ran to completion.', 'result': False}, |
- {'content': 'This is a testharness.js-based test.\n FAIL: bah \n Harness: the test ran to completion.', 'result': False}, |
- {'content': 'This is a testharness.js-based test.\n TIMEOUT: bah \n Harness: the test ran to completion.', 'result': False}, |
- {'content': 'This is a testharness.js-based test.\n NOTRUN: bah \n Harness: the test ran to completion.', 'result': False}, |
- {'content': 'CONSOLE LOG: error.\nThis is a testharness.js-based test.\nPASS: things are fine.\nHarness: the test ran to completion.\n\n', 'result': True}, |
- {'content': 'CONSOLE ERROR: error.\nThis is a testharness.js-based test.\nPASS: things are fine.\nHarness: the test ran to completion.\n\n', 'result': True}, |
- {'content': 'RANDOM TEXT.\nThis is a testharness.js-based test.\nPASS: things are fine.\n.Harness: the test ran to completion.\n\n', 'result': False}, |
+ {'content': 'This is a testharness.js-based test.\n FAIL: bah \n Harness: the test ran to completion.', |
+ 'result': False}, |
+ {'content': 'This is a testharness.js-based test.\n TIMEOUT: bah \n Harness: the test ran to completion.', |
+ 'result': False}, |
+ {'content': 'This is a testharness.js-based test.\n NOTRUN: bah \n Harness: the test ran to completion.', |
+ 'result': False}, |
+ {'content': 'CONSOLE LOG: error.\nThis is a testharness.js-based test.\nPASS: things are fine.\nHarness: the test ran to completion.\n\n', |
+ 'result': True}, |
+ {'content': 'CONSOLE ERROR: error.\nThis is a testharness.js-based test.\nPASS: things are fine.\nHarness: the test ran to completion.\n\n', |
+ 'result': True}, |
+ {'content': 'RANDOM TEXT.\nThis is a testharness.js-based test.\nPASS: things are fine.\n.Harness: the test ran to completion.\n\n', |
+ 'result': False}, |
] |
for data in test_data: |