[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit cbad3bb04ff869729fb57f3dfd8fe070039aca87
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 02:15:05 2011 +0000

    2011-01-05  Eric Seidel  <eric at webkit.org>
    
            Unreviewed, just fixing one more log error from my previous python patch.
    
            Move LayoutTestResults over to new-run-webkit-tests TestResult architecture
            https://bugs.webkit.org/show_bug.cgi?id=51802
    
            webkit-patch failure-reason was logging about parsing errors
            due to my misunderstanding of how BeautifulSoup.findAll worked.
    
            Fixed, and added a unit test.
    
            * Scripts/webkitpy/common/net/layouttestresults.py:
            * Scripts/webkitpy/common/net/layouttestresults_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index d0337bc..d094991 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-05  Eric Seidel  <eric at webkit.org>
+
+        Unreviewed, just fixing one more log error from my previous python patch.
+
+        Move LayoutTestResults over to new-run-webkit-tests TestResult architecture
+        https://bugs.webkit.org/show_bug.cgi?id=51802
+
+        webkit-patch failure-reason was logging about parsing errors
+        due to my misunderstanding of how BeautifulSoup.findAll worked.
+
+        Fixed, and added a unit test.
+
+        * Scripts/webkitpy/common/net/layouttestresults.py:
+        * Scripts/webkitpy/common/net/layouttestresults_unittest.py:
+
 2011-01-05  Benjamin Poulain  <benjamin.poulain at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/Tools/Scripts/webkitpy/common/net/layouttestresults.py b/Tools/Scripts/webkitpy/common/net/layouttestresults.py
index 6ac77f0..28caad4 100644
--- a/Tools/Scripts/webkitpy/common/net/layouttestresults.py
+++ b/Tools/Scripts/webkitpy/common/net/layouttestresults.py
@@ -62,12 +62,15 @@ class LayoutTestResults(object):
 
     @classmethod
     def _failures_from_fail_row(self, row):
-        # The first anchor should have already been fetched by the caller,
-        # we look at all remaining anchors in this row, and guess what type
+        # Look at all anchors in this row, and guess what type
         # of new-run-webkit-test failures they equate to.
         failures = set()
+        test_name = None
         for anchor in row.findAll("a"):
             anchor_text = unicode(anchor.string)
+            if not test_name:
+                test_name = anchor_text
+                continue
             if anchor_text in ["expected image", "image diffs"] or '%' in anchor_text:
                 failures.add(test_failures.FailureImageHashMismatch())
             elif anchor_text in ["expected", "actual", "diff", "pretty diff"]:
diff --git a/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py b/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py
index 14a9ed3..d274dbf 100644
--- a/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py
+++ b/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py
@@ -76,11 +76,13 @@ class LayoutTestResultsTest(unittest.TestCase):
         self.assertEqual(len(results.failing_tests()), 0)
 
     def test_failures_from_fail_row(self):
-        row = BeautifulSoup("<tr><td><a>25%</a></td></tr>")
-        failures = LayoutTestResults._failures_from_fail_row(row)
+        row = BeautifulSoup("<tr><td><a>test.hml</a><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>foo</a></td></tr>")
+        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)

-- 
WebKit Debian packaging