[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 445d15e8d66a149b01ad40ae6b788be3b0a5d863
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 17 07:52:52 2009 +0000

    2009-12-16  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [bzt] Make UpdateStep quiet
            https://bugs.webkit.org/show_bug.cgi?id=32599
    
            * Scripts/modules/buildsteps.py:
            * Scripts/modules/buildsteps_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52241 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index bf87ce0..d306aee 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-16  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [bzt] Make UpdateStep quiet
+        https://bugs.webkit.org/show_bug.cgi?id=32599
+
+        * Scripts/modules/buildsteps.py:
+        * Scripts/modules/buildsteps_unittest.py:
+
 2009-12-16  Evan Martin  <evan at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/modules/buildsteps.py b/WebKitTools/Scripts/modules/buildsteps.py
index fb0e588..0effc48 100644
--- a/WebKitTools/Scripts/modules/buildsteps.py
+++ b/WebKitTools/Scripts/modules/buildsteps.py
@@ -161,7 +161,7 @@ class UpdateStep(AbstractStep):
         if not self._options.update:
             return
         log("Updating working directory")
-        self._tool.executive.run_and_throw_if_fail(self.port().update_webkit_command())
+        self._tool.executive.run_and_throw_if_fail(self.port().update_webkit_command(), quiet=True)
 
 
 class ApplyPatchStep(AbstractStep):
diff --git a/WebKitTools/Scripts/modules/buildsteps_unittest.py b/WebKitTools/Scripts/modules/buildsteps_unittest.py
index f753e0b..b7fbb0c 100644
--- a/WebKitTools/Scripts/modules/buildsteps_unittest.py
+++ b/WebKitTools/Scripts/modules/buildsteps_unittest.py
@@ -28,9 +28,11 @@
 
 import unittest
 
-from modules.buildsteps import UpdateChangelogsWithReviewerStep
+from modules.buildsteps import UpdateChangelogsWithReviewerStep, UpdateStep
 from modules.mock_bugzillatool import MockBugzillaTool
 from modules.outputcapture import OutputCapture
+from modules.mock import Mock
+
 
 class UpdateChangelogsWithReviewerStepTest(unittest.TestCase):
     def test_guess_reviewer_from_bug(self):
@@ -38,3 +40,15 @@ class UpdateChangelogsWithReviewerStepTest(unittest.TestCase):
         step = UpdateChangelogsWithReviewerStep(MockBugzillaTool(), [])
         expected_stderr = "0 reviewed patches on bug 1, cannot infer reviewer.\n"
         capture.assert_outputs(self, step._guess_reviewer_from_bug, [1], expected_stderr=expected_stderr)
+
+
+class StepsTest(unittest.TestCase):
+    def _run_step(self, step, options, state=None):
+        if not state:
+            state = {}
+        step(MockBugzillaTool(), options).run(state)
+
+    def test_update_step(self):
+        options = Mock()
+        options.update = True
+        self._run_step(UpdateStep, options)

-- 
WebKit Debian packaging