[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f5670512c0b03fceb8d049e4a56909963dc259f2
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 21:29:33 2010 +0000

    2010-09-30  Adam Barth  <abarth at webkit.org>
    
            Third attempt.  We need a better integration test environment.
    
            * Scripts/webkitpy/common/net/failuremap.py:
            * Scripts/webkitpy/common/net/failuremap_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68827 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7c2092b..efb0d0c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-30  Adam Barth  <abarth at webkit.org>
+
+        Third attempt.  We need a better integration test environment.
+
+        * Scripts/webkitpy/common/net/failuremap.py:
+        * Scripts/webkitpy/common/net/failuremap_unittest.py:
+
 2010-09-30  Robert Hogan  <robert at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebKitTools/Scripts/webkitpy/common/net/failuremap.py b/WebKitTools/Scripts/webkitpy/common/net/failuremap.py
index ef680a3..a0f1f11 100644
--- a/WebKitTools/Scripts/webkitpy/common/net/failuremap.py
+++ b/WebKitTools/Scripts/webkitpy/common/net/failuremap.py
@@ -51,8 +51,9 @@ class FailureMap(object):
     def tests_failing_for(self, revision):
         tests = [failure_info['regression_window'].failing_tests()
                  for failure_info in self._failures
-                 if revision in failure_info['regression_window'].revisions()]
-        return sorted(set(sum(failing_tests, [])))
+                 if revision in failure_info['regression_window'].revisions()
+                    and failure_info['regression_window'].failing_tests()]
+        return sorted(set(sum(tests, [])))
 
     def _old_failures(self, is_old_failure):
         return filter(lambda revision: is_old_failure(revision),
diff --git a/WebKitTools/Scripts/webkitpy/common/net/failuremap_unittest.py b/WebKitTools/Scripts/webkitpy/common/net/failuremap_unittest.py
index e572da8..f6e8ea8 100644
--- a/WebKitTools/Scripts/webkitpy/common/net/failuremap_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/common/net/failuremap_unittest.py
@@ -70,3 +70,7 @@ class FailureMapTest(unittest.TestCase):
         failure_map = self._make_failure_map()
         failure_map.filter_out_old_failures(lambda revision: revision == 1235)
         self.assertEquals(failure_map.failing_revisions(), [1234])
+
+    def test_tests_failing_for(self):
+        failure_map = self._make_failure_map()
+        self.assertEquals(failure_map.tests_failing_for(1234), [])

-- 
WebKit Debian packaging