Changeset 52025 in webkit

Timestamp:

Dec 11, 2009 2:39:29 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-11 Eric Seidel <​eric@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:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/commands/commandtest.py (modified) (1 diff)
• Scripts/modules/commands/download_unittest.py (modified) (3 diffs)
• Scripts/modules/commands/upload_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-11  Eric Seidel  <eric@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@webkit.org>
 

trunk/WebKitTools/Scripts/modules/commands/commandtest.py

@@ -40 +40 @@
         (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)

trunk/WebKitTools/Scripts/modules/commands/download_unittest.py

@@ -48 +48 @@
 
     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):
@@ -54 +55 @@
         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):
@@ -60 +62 @@
         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)

trunk/WebKitTools/Scripts/modules/commands/upload_unittest.py

@@ -40 +40 @@
 
     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)