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

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit f5535a77f8300d9c052e0565c5563e692c1a05bf
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 4 09:48:06 2010 +0000

    2010-01-04  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Remove raw_input from queues in favor of user.prompt
            https://bugs.webkit.org/show_bug.cgi?id=33140
    
            This lets up properly mock out the user interaction instead of hacking
            around it with the options.
    
            * Scripts/webkitpy/commands/queues.py:
            * Scripts/webkitpy/commands/queuestest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52719 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index be6a8b7..b26e80b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-04  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Remove raw_input from queues in favor of user.prompt
+        https://bugs.webkit.org/show_bug.cgi?id=33140
+
+        This lets up properly mock out the user interaction instead of hacking
+        around it with the options.
+
+        * Scripts/webkitpy/commands/queues.py:
+        * Scripts/webkitpy/commands/queuestest.py:
+
 2010-01-04  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitpy/commands/queues.py b/WebKitTools/Scripts/webkitpy/commands/queues.py
index a34ff1a..ef19145 100644
--- a/WebKitTools/Scripts/webkitpy/commands/queues.py
+++ b/WebKitTools/Scripts/webkitpy/commands/queues.py
@@ -86,7 +86,7 @@ class AbstractQueue(Command, QueueEngineDelegate):
     def begin_work_queue(self):
         log("CAUTION: %s will discard all local changes in \"%s\"" % (self.name, self.tool.scm().checkout_root))
         if self.options.confirm:
-            response = raw_input("Are you sure?  Type \"yes\" to continue: ")
+            response = self.tool.user.prompt("Are you sure?  Type \"yes\" to continue: ")
             if (response != "yes"):
                 error("User declined.")
         log("Running WebKit %s." % self.name)
diff --git a/WebKitTools/Scripts/webkitpy/commands/queuestest.py b/WebKitTools/Scripts/webkitpy/commands/queuestest.py
index a525fcc..71096b6 100644
--- a/WebKitTools/Scripts/webkitpy/commands/queuestest.py
+++ b/WebKitTools/Scripts/webkitpy/commands/queuestest.py
@@ -57,7 +57,7 @@ class QueuesTest(unittest.TestCase):
             args = []
         if not work_item:
             work_item = self.mock_work_item
-        options.confirm = False # FIXME: We should have a tool.user that we can mock.
+        tool.user.prompt = lambda message: "yes"
 
         queue.execute(options, args, tool, engine=MockQueueEngine)
 

-- 
WebKit Debian packaging