[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 877b4d2557af14e0962e96cdce8052575a3a5181
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 11 08:22:00 2010 +0000

    2010-10-11  Adam Barth  <abarth at webkit.org>
    
            Unreviewed.
    
            Fix sheriffbot not to crash when there are failing tests.  It turns out
            Python sets don't support the + operator.  We need to use union
            instead.  There's a more elegant way to do this in Python 2.6, but we
            need this code to work in 2.5.
    
            * Scripts/webkitpy/common/net/failuremap.py:
            * Scripts/webkitpy/common/net/failuremap_unittest.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69480 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b038c5b..42a5b51 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-11  Adam Barth  <abarth at webkit.org>
+
+        Unreviewed.
+
+        Fix sheriffbot not to crash when there are failing tests.  It turns out
+        Python sets don't support the + operator.  We need to use union
+        instead.  There's a more elegant way to do this in Python 2.6, but we
+        need this code to work in 2.5.
+
+        * Scripts/webkitpy/common/net/failuremap.py:
+        * Scripts/webkitpy/common/net/failuremap_unittest.py:
+
 2010-10-10  Robert Hogan  <robert at webkit.org>
 
         Unreviewed, fix failing test from r69468.
diff --git a/WebKitTools/Scripts/webkitpy/common/net/failuremap.py b/WebKitTools/Scripts/webkitpy/common/net/failuremap.py
index a0f1f11..e2d53ae 100644
--- a/WebKitTools/Scripts/webkitpy/common/net/failuremap.py
+++ b/WebKitTools/Scripts/webkitpy/common/net/failuremap.py
@@ -53,7 +53,10 @@ class FailureMap(object):
                  for failure_info in self._failures
                  if revision in failure_info['regression_window'].revisions()
                     and failure_info['regression_window'].failing_tests()]
-        return sorted(set(sum(tests, [])))
+        result = set()
+        for test in tests:
+            result = result.union(test)
+        return sorted(result)
 
     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 f6e8ea8..2f0b49d 100644
--- a/WebKitTools/Scripts/webkitpy/common/net/failuremap_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/common/net/failuremap_unittest.py
@@ -43,8 +43,8 @@ class FailureMapTest(unittest.TestCase):
     build2a = Build(builder2, build_number=89, revision=1233, is_green=True)
     build2b = Build(builder2, build_number=90, revision=1235, is_green=False)
 
-    regression_window1 = RegressionWindow(build1a, build1b)
-    regression_window2 = RegressionWindow(build2a, build2b)
+    regression_window1 = RegressionWindow(build1a, build1b, failing_tests=[u'test1', u'test1'])
+    regression_window2 = RegressionWindow(build2a, build2b, failing_tests=[u'test1'])
 
     def _make_failure_map(self):
         failure_map = FailureMap()
@@ -73,4 +73,4 @@ class FailureMapTest(unittest.TestCase):
 
     def test_tests_failing_for(self):
         failure_map = self._make_failure_map()
-        self.assertEquals(failure_map.tests_failing_for(1234), [])
+        self.assertEquals(failure_map.tests_failing_for(1234), [u'test1'])

-- 
WebKit Debian packaging