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

[mihaip at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 41ead96a374b43ef328e2aac83c503605d1fc3ee
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 27 22:42:42 2010 +0000

    2010-09-27  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Eric Seidel.
    
            webkitpy.common.system.user_unittest.UserTest.test_prompt_with_list spams the console
            https://bugs.webkit.org/show_bug.cgi?id=46634
    
            Use OutputCapture to prevent console spam (and also check for expected
            output).
    
            * Scripts/webkitpy/common/system/user_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68432 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ebb481a..4908b16 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-27  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        webkitpy.common.system.user_unittest.UserTest.test_prompt_with_list spams the console
+        https://bugs.webkit.org/show_bug.cgi?id=46634
+        
+        Use OutputCapture to prevent console spam (and also check for expected
+        output).
+
+        * Scripts/webkitpy/common/system/user_unittest.py:
+
 2010-09-27  Eric Seidel  <eric at webkit.org>
 
         Reviewed by James Robinson.
diff --git a/WebKitTools/Scripts/webkitpy/common/system/user_unittest.py b/WebKitTools/Scripts/webkitpy/common/system/user_unittest.py
index a496421..23b546f 100644
--- a/WebKitTools/Scripts/webkitpy/common/system/user_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/common/system/user_unittest.py
@@ -28,6 +28,7 @@
 
 import unittest
 
+from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.user import User
 
 class UserTest(unittest.TestCase):
@@ -51,21 +52,28 @@ class UserTest(unittest.TestCase):
         self.assertEqual(User.prompt("input", repeat=self.repeatsRemaining, raw_input=mock_raw_input), None)
 
     def test_prompt_with_list(self):
-        def run_prompt_test(options, inputs, expected_result, can_choose_multiple=False):
+        def run_prompt_test(inputs, expected_result, can_choose_multiple=False):
             def mock_raw_input(message):
                 return inputs.pop(0)
-            self.assertEqual(User.prompt_with_list("title", options, can_choose_multiple=can_choose_multiple, raw_input=mock_raw_input), expected_result)
+            output_capture = OutputCapture()
+            actual_result = output_capture.assert_outputs(
+                self,
+                User.prompt_with_list,
+                args=["title", ["foo", "bar"]],
+                kwargs={"can_choose_multiple": can_choose_multiple, "raw_input": mock_raw_input},
+                expected_stdout="title\n 1. foo\n 2. bar\n")
+            self.assertEqual(actual_result, expected_result)
             self.assertEqual(len(inputs), 0)
 
-        run_prompt_test(["foo", "bar"], ["1"], "foo")
-        run_prompt_test(["foo", "bar"], ["badinput", "2"], "bar")
+        run_prompt_test(["1"], "foo")
+        run_prompt_test(["badinput", "2"], "bar")
 
-        run_prompt_test(["foo", "bar"], ["1,2"], ["foo", "bar"], can_choose_multiple=True)
-        run_prompt_test(["foo", "bar"], ["  1,  2   "], ["foo", "bar"], can_choose_multiple=True)
-        run_prompt_test(["foo", "bar"], ["all"], ["foo", "bar"], can_choose_multiple=True)
-        run_prompt_test(["foo", "bar"], [""], ["foo", "bar"], can_choose_multiple=True)
-        run_prompt_test(["foo", "bar"], ["  "], ["foo", "bar"], can_choose_multiple=True)
-        run_prompt_test(["foo", "bar"], ["badinput", "all"], ["foo", "bar"], can_choose_multiple=True)
+        run_prompt_test(["1,2"], ["foo", "bar"], can_choose_multiple=True)
+        run_prompt_test(["  1,  2   "], ["foo", "bar"], can_choose_multiple=True)
+        run_prompt_test(["all"], ["foo", "bar"], can_choose_multiple=True)
+        run_prompt_test([""], ["foo", "bar"], can_choose_multiple=True)
+        run_prompt_test(["  "], ["foo", "bar"], can_choose_multiple=True)
+        run_prompt_test(["badinput", "all"], ["foo", "bar"], can_choose_multiple=True)
 
 if __name__ == '__main__':
     unittest.main()

-- 
WebKit Debian packaging