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

eric at webkit.org eric at webkit.org
Fri Jan 21 14:59:14 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 8865edfa5de7c4a1e221184db4e91dede9bd38fa
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 5 23:57:02 2011 +0000

    2011-01-05  Eric Seidel  <eric at webkit.org>
    
            Unreviewed.
    
            Move LayoutTestResults over to new-run-webkit-tests TestResult architecture
            https://bugs.webkit.org/show_bug.cgi?id=51802
    
            Add another unit test to cover a previously missing import.
    
            * Scripts/webkitpy/common/net/layouttestresults.py:
            * Scripts/webkitpy/common/net/layouttestresults_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75113 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 15841f5..8bfc1d4 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-05  Eric Seidel  <eric at webkit.org>
+
+        Unreviewed.
+
+        Move LayoutTestResults over to new-run-webkit-tests TestResult architecture
+        https://bugs.webkit.org/show_bug.cgi?id=51802
+
+        Add another unit test to cover a previously missing import.
+
+        * Scripts/webkitpy/common/net/layouttestresults.py:
+        * Scripts/webkitpy/common/net/layouttestresults_unittest.py:
+
 2011-01-05  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by David Levin.
diff --git a/Tools/Scripts/webkitpy/common/net/layouttestresults.py b/Tools/Scripts/webkitpy/common/net/layouttestresults.py
index 02a30b8..62253fb 100644
--- a/Tools/Scripts/webkitpy/common/net/layouttestresults.py
+++ b/Tools/Scripts/webkitpy/common/net/layouttestresults.py
@@ -29,6 +29,7 @@
 # A module for parsing results.html files generated by old-run-webkit-tests
 # This class is one big hack and only needs to exist until we transition to new-run-webkit-tests.
 
+from webkitpy.common.system.deprecated_logging import log
 from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup, SoupStrainer
 from webkitpy.layout_tests.layout_package import test_results
 from webkitpy.layout_tests.layout_package import test_failures
diff --git a/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py b/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py
index 391e3aa..386dd3f 100644
--- a/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py
+++ b/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py
@@ -29,6 +29,7 @@
 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
@@ -75,8 +76,11 @@ class LayoutTestResultsTest(unittest.TestCase):
         self.assertEqual(len(results.failing_tests()), 0)
 
     def test_failures_from_fail_row(self):
-        row_html = "<tr><td><a>25%</a></td></tr>"
-        row = BeautifulSoup(row_html)
+        row = BeautifulSoup("<tr><td><a>25%</a></td></tr>")
         failures = 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>")
+        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



More information about the Pkg-webkit-commits mailing list