1 files changed, 21 insertions, 10 deletions
diff --git a/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py b/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py
index 8490eae..01b91b8 100644
--- a/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py
+++ b/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py
@@ -29,6 +29,10 @@
 import unittest
 
 from webkitpy.common.net.layouttestresults import LayoutTestResults
+from webkitpy.common.system.outputcapture import OutputCapture
+from webkitpy.layout_tests.layout_package import test_results
+from webkitpy.layout_tests.layout_package import test_failures
+from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup
 
 
 class LayoutTestResultsTest(unittest.TestCase):
@@ -57,21 +61,28 @@ class LayoutTestResultsTest(unittest.TestCase):
 </html>
 """
 
-    _expected_layout_test_results = {
-        'Tests that had stderr output:': [
-            'accessibility/aria-activedescendant-crash.html',
-        ],
-        'Tests that had no expected results (probably new):': [
-            'fast/repaint/no-caret-repaint-in-non-content-editable-element.html',
-        ],
-    }
-
     def test_parse_layout_test_results(self):
+        failures = [test_failures.FailureMissingResult(), test_failures.FailureMissingImageHash(), test_failures.FailureMissingImage()]
+        testname = 'fast/repaint/no-caret-repaint-in-non-content-editable-element.html'
+        expected_results = [test_results.TestResult(testname, failures)]
+
         results = LayoutTestResults._parse_results_html(self._example_results_html)
-        self.assertEqual(self._expected_layout_test_results, results)
+        self.assertEqual(expected_results, results)
 
     def test_results_from_string(self):
         self.assertEqual(LayoutTestResults.results_from_string(None), None)
         self.assertEqual(LayoutTestResults.results_from_string(""), None)
         results = LayoutTestResults.results_from_string(self._example_results_html)
         self.assertEqual(len(results.failing_tests()), 0)
+
+    def test_failures_from_fail_row(self):
+        row = BeautifulSoup("<tr><td><a>test.hml</a></td><td><a>expected image</a></td><td><a>25%</a></td></tr>")
+        test_name = unicode(row.find("a").string)
+        # Even if the caller has already found the test name, findAll inside _failures_from_fail_row will see it again.
+        failures = OutputCapture().assert_outputs(self, LayoutTestResults._failures_from_fail_row, [row])
+        self.assertEqual(len(failures), 1)
+        self.assertEqual(type(sorted(failures)[0]), test_failures.FailureImageHashMismatch)
+
+        row = BeautifulSoup("<tr><td><a>test.hml</a><a>foo</a></td></tr>")
+        expected_stderr = "Unhandled link text in results.html parsing: foo.  Please file a bug against webkitpy.\n"
+        OutputCapture().assert_outputs(self, LayoutTestResults._failures_from_fail_row, [row], expected_stderr=expected_stderr)