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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ac11e123d85418c0f660bb7f7526a37d1034caaa
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 11 22:39:29 2009 +0000

    2009-12-11  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            CommandsTest.assert_execute_outputs doesn't check stderr
            https://bugs.webkit.org/show_bug.cgi?id=32352
    
            Fix assert_execute_outputs to check stderr
            and then fix all the unit tests which needed to
            pass stderr output.
    
            * Scripts/modules/commands/commandtest.py:
            * Scripts/modules/commands/download_unittest.py:
            * Scripts/modules/commands/upload_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52025 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9625fb1..4f658fe 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2009-12-11  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        CommandsTest.assert_execute_outputs doesn't check stderr
+        https://bugs.webkit.org/show_bug.cgi?id=32352
+
+        Fix assert_execute_outputs to check stderr
+        and then fix all the unit tests which needed to
+        pass stderr output.
+
+        * Scripts/modules/commands/commandtest.py:
+        * Scripts/modules/commands/download_unittest.py:
+        * Scripts/modules/commands/upload_unittest.py:
+
 2009-12-11  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/modules/commands/commandtest.py b/WebKitTools/Scripts/modules/commands/commandtest.py
index 618a517..30c0de5 100644
--- a/WebKitTools/Scripts/modules/commands/commandtest.py
+++ b/WebKitTools/Scripts/modules/commands/commandtest.py
@@ -39,4 +39,4 @@ class CommandsTest(unittest.TestCase):
         command.execute(options, args, tool)
         (stdout_string, stderr_string) = capture.restore_output()
         self.assertEqual(stdout_string, expected_stdout)
-        self.assertEqual(expected_stderr, expected_stderr)
+        self.assertEqual(stderr_string, expected_stderr)
diff --git a/WebKitTools/Scripts/modules/commands/download_unittest.py b/WebKitTools/Scripts/modules/commands/download_unittest.py
index a1ed41a..ff209d9 100644
--- a/WebKitTools/Scripts/modules/commands/download_unittest.py
+++ b/WebKitTools/Scripts/modules/commands/download_unittest.py
@@ -47,31 +47,39 @@ class DownloadCommandsTest(CommandsTest):
         return options
 
     def test_build(self):
-        self.assert_execute_outputs(Build(), [], options=self._default_options())
+        expected_stderr = "Updating working directory\nBuilding WebKit\n"
+        self.assert_execute_outputs(Build(), [], options=self._default_options(), expected_stderr=expected_stderr)
 
     def test_apply_attachment(self):
         options = self._default_options()
         options.update = True
         options.local_commit = True
-        self.assert_execute_outputs(ApplyAttachment(), [197], options=options)
+        expected_stderr = "Updating working directory\nApplying attachment 197 from bug 42\n"
+        self.assert_execute_outputs(ApplyAttachment(), [197], options=options, expected_stderr=expected_stderr)
 
     def test_apply_patches(self):
         options = self._default_options()
         options.update = True
         options.local_commit = True
-        self.assert_execute_outputs(ApplyPatches(), [42], options=options)
+        expected_stderr = "Updating working directory\nApplying attachment 197 from bug 42\nApplying attachment 128 from bug 42\n"
+        self.assert_execute_outputs(ApplyPatches(), [42], options=options, expected_stderr=expected_stderr)
 
     def test_land_diff(self):
-        self.assert_execute_outputs(LandDiff(), [42], options=self._default_options())
+        expected_stderr = "Building WebKit\nUpdating bug 42\n"
+        self.assert_execute_outputs(LandDiff(), [42], options=self._default_options(), expected_stderr=expected_stderr)
 
     def test_check_style(self):
-        self.assert_execute_outputs(CheckStyle(), [197], options=self._default_options())
+        expected_stderr = "Processing 1 patch from 1 bug.\nUpdating working directory\nProcessing patch 197 from bug 42.\nRunning check-webkit-style\n"
+        self.assert_execute_outputs(CheckStyle(), [197], options=self._default_options(), expected_stderr=expected_stderr)
 
     def test_build_attachment(self):
-        self.assert_execute_outputs(BuildAttachment(), [197], options=self._default_options())
+        expected_stderr = "Processing 1 patch from 1 bug.\nUpdating working directory\nProcessing patch 197 from bug 42.\nBuilding WebKit\n"
+        self.assert_execute_outputs(BuildAttachment(), [197], options=self._default_options(), expected_stderr=expected_stderr)
 
     def test_land_attachment(self):
-        self.assert_execute_outputs(LandAttachment(), [197], options=self._default_options())
+        expected_stderr = "Processing 1 patch from 1 bug.\nUpdating working directory\nProcessing patch 197 from bug 42.\nBuilding WebKit\n"
+        self.assert_execute_outputs(LandAttachment(), [197], options=self._default_options(), expected_stderr=expected_stderr)
 
     def test_land_patches(self):
-        self.assert_execute_outputs(LandPatches(), [42], options=self._default_options())
+        expected_stderr = "2 reviewed patches found on bug 42.\nProcessing 2 patches from 1 bug.\nUpdating working directory\nProcessing patch 197 from bug 42.\nBuilding WebKit\nUpdating working directory\nProcessing patch 128 from bug 42.\nBuilding WebKit\n"
+        self.assert_execute_outputs(LandPatches(), [42], options=self._default_options(), expected_stderr=expected_stderr)
diff --git a/WebKitTools/Scripts/modules/commands/upload_unittest.py b/WebKitTools/Scripts/modules/commands/upload_unittest.py
index 4d3f85c..cf003aa 100644
--- a/WebKitTools/Scripts/modules/commands/upload_unittest.py
+++ b/WebKitTools/Scripts/modules/commands/upload_unittest.py
@@ -39,4 +39,5 @@ class UploadCommandsTest(CommandsTest):
         self.assert_execute_outputs(ObsoleteAttachments(), [42])
 
     def test_post_diff(self):
-        self.assert_execute_outputs(PostDiff(), [42])
+        expected_stderr = "Obsoleting 2 old patches on bug 42\n"
+        self.assert_execute_outputs(PostDiff(), [42], expected_stderr=expected_stderr)

-- 
WebKit Debian packaging