Changeset 51381 in webkit

Timestamp:

Nov 25, 2009 7:46:04 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-25 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Abstract out capturing stdout/stderr into a new OutputCapture class for re-use among the various unit tests.
​https://bugs.webkit.org/show_bug.cgi?id=31870

• Scripts/modules/commands/queries_unittest.py: Use the new class.
• Scripts/modules/multicommandtool_unittest.py: Ditto.
• Scripts/modules/outputcapture.py: Added.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/commands/queries_unittest.py (modified) (1 diff)
• Scripts/modules/multicommandtool_unittest.py (modified) (3 diffs)
• Scripts/modules/outputcapture.py (added)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-25  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Abstract out capturing stdout/stderr into a new OutputCapture class for re-use among the various unit tests.
+        https://bugs.webkit.org/show_bug.cgi?id=31870
+
+        * Scripts/modules/commands/queries_unittest.py: Use the new class.
+        * Scripts/modules/multicommandtool_unittest.py: Ditto.
+        * Scripts/modules/outputcapture.py: Added.
+
 2009-11-24  Dmitry Titov  <dimich@chromium.org>
 

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

@@ -28 +28 @@
 
 import unittest
-from StringIO import StringIO
 
 from modules.commands.queries import *
 from modules.mock_bugzillatool import *
+from modules.outputcapture import OutputCapture
 
 class QueryCommandsTest(unittest.TestCase):
-    def _capture_output_with_name(output_name):
-        self.saved_outputs[output_name] = getattr(sys, output_name)
-        setattr(sys, output_name, StringIO.StringIO())
-
-    def _release_output_with_name(output_name):
-        captured_output = getattr(sys, output_name).getvalue()
-        setattr(sys, output_name, self.saved_outputs[output_name])
-        del self.saved_outputs[output_name]
-        return captured_output
-
-    def _capture_output(self):
-        self._capture_output_with_name("stdout")
-        self._capture_output_with_name("stderr")
-
-    def _restore_output(self):
-        return (self._release_output_with_name("stdout"), self._release_output_with_name("stderr"))
-
     def _assert_execute_outputs(self, command, command_args, expected_stdout, expected_stderr = ""):
-        self._capture_output()
+        capture = OutputCapture()
+        capture.capture_output()
         command.execute(None, command_args, MockBugzillaTool())
-        (stdout_string, stderr_string) = self._restore_output()
+        (stdout_string, stderr_string) = capture.restore_output()
         self.assertEqual(stdout_string, expected_stdout)
         self.assertEqual(expected_stderr, expected_stderr)

trunk/WebKitTools/Scripts/modules/multicommandtool_unittest.py

@@ -30 +30 @@
 import unittest
 from multicommandtool import MultiCommandTool, Command
-from StringIO import StringIO
+from modules.outputcapture import OutputCapture
 
 from optparse import make_option
@@ -67 +67 @@
 
 class MultiCommandToolTest(unittest.TestCase):
-    def _capture_stderr(self):
-        self.saved_stderr = sys.stderr
-        sys.stderr = StringIO()
-
-    def _release_stderr(self):
-        string = sys.stderr.getvalue()
-        sys.stderr = self.saved_stderr
-        self.saved_stderr = None
-        return string
-
     def _assert_split(self, args, expected_split):
         self.assertEqual(MultiCommandTool._split_args(args), expected_split)
@@ -104 +94 @@
         tool = TrivialTool(commands=[command_with_options])
 
-        self._capture_stderr()
+        capture = OutputCapture()
+        capture.capture_output()
         exit_code = tool.main(["tool", "help", "trivial"])
-        help_text = self._release_stderr()
-        expected_subcommand_help = "  trivial [options]   help text\nOptions:\n  --my_option=MY_OPTION\n\n"
+        (stdout_string, stderr_string) = capture.restore_output()
+        expected_subcommand_help = "trivial [options]   help text\nOptions:\n  --my_option=MY_OPTION\n\n"
         self.assertEqual(exit_code, 0)
-        self.assertEqual(help_text, expected_subcommand_help)
+        self.assertEqual(stdout_string, "")
+        self.assertEqual(stderr_string, expected_subcommand_help)