[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2c63254812f447dafe0cb2df50beb452423e6004
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 11 00:20:06 2009 +0000

    2009-12-10  Eric Seidel  <eric at webkit.org>
    
            No review, just updating unit tests to match recent checkins.
    
            * Scripts/modules/mock_bugzillatool.py:
             - Add missing red_core_builders_names method causing exception.
            * Scripts/modules/workqueue_unittest.py:
             - processutils is dead, use executive.py instead.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51972 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a816b8f..c55009d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,14 @@
 2009-12-10  Eric Seidel  <eric at webkit.org>
 
+        No review, just updating unit tests to match recent checkins.
+
+        * Scripts/modules/mock_bugzillatool.py:
+         - Add missing red_core_builders_names method causing exception.
+        * Scripts/modules/workqueue_unittest.py:
+         - processutils is dead, use executive.py instead.
+
+2009-12-10  Eric Seidel  <eric at webkit.org>
+
         Reviewed by Adam Barth.
 
         Move run_command onto Executive to make code which uses run_command testable
diff --git a/WebKitTools/Scripts/modules/mock_bugzillatool.py b/WebKitTools/Scripts/modules/mock_bugzillatool.py
index 4f32146..e600947 100644
--- a/WebKitTools/Scripts/modules/mock_bugzillatool.py
+++ b/WebKitTools/Scripts/modules/mock_bugzillatool.py
@@ -105,6 +105,8 @@ class MockBuildBot(Mock):
             "is_green": True
         }]
 
+    def red_core_builders_names(self):
+        return []
 
 class MockSCM(Mock):
     def __init__(self):
diff --git a/WebKitTools/Scripts/modules/workqueue_unittest.py b/WebKitTools/Scripts/modules/workqueue_unittest.py
index 04c74c8..ed77b5f 100644
--- a/WebKitTools/Scripts/modules/workqueue_unittest.py
+++ b/WebKitTools/Scripts/modules/workqueue_unittest.py
@@ -32,7 +32,7 @@ import shutil
 import tempfile
 import unittest
 
-from modules.processutils import ScriptError
+from modules.executive import ScriptError
 from modules.workqueue import WorkQueue, WorkQueueDelegate
 
 class LoggingDelegate(WorkQueueDelegate):

-- 
WebKit Debian packaging