Changeset 52239 in webkit

Timestamp:

Dec 16, 2009 11:40:27 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2009-12-16 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

post-diff is failing with exception under guess_reviewer_from_bug
​https://bugs.webkit.org/show_bug.cgi?id=32642

Also refactor output capturing code into
OutputCapture.assert_outputs to share more code between tests.

• Scripts/modules/buildsteps.py:
  • Add the missing include.
  • Give guess_reviewer_from_bug a private underscore.
• Scripts/modules/buildsteps_unittest.py: Added.
  • Test to make sure _guess_reviewer_from_bug works as expected.
• Scripts/modules/commands/commandtest.py:
  • Custom code is now obsoleted by OutputCapture.assert_outputs
• Scripts/modules/commands/queues_unittest.py:
  • ditto
• Scripts/modules/credentials_unittest.py:
  • ditto
• Scripts/modules/mock_bugzillatool.py:
  • fetch_reviewed_patches_from_bug can never return None
• Scripts/modules/multicommandtool_unittest.py:
  • Custom code is now obsoleted by OutputCapture.assert_outputs
• Scripts/modules/outputcapture.py:
  • Add assert_outputs to share more code between tests.
• Scripts/run-webkit-unittests:
  • Add buildsteps_unittest.py

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/buildsteps.py (modified) (3 diffs)
• Scripts/modules/buildsteps_unittest.py (copied) (copied from trunk/WebKitTools/Scripts/modules/commands/commandtest.py) (1 diff)
• Scripts/modules/commands/commandtest.py (modified) (1 diff)
• Scripts/modules/commands/queues_unittest.py (modified) (1 diff)
• Scripts/modules/credentials_unittest.py (modified) (1 diff)
• Scripts/modules/mock_bugzillatool.py (modified) (1 diff)
• Scripts/modules/multicommandtool_unittest.py (modified) (2 diffs)
• Scripts/modules/outputcapture.py (modified) (1 diff)
• Scripts/run-webkit-unittests (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-16  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        post-diff is failing with exception under guess_reviewer_from_bug
+        https://bugs.webkit.org/show_bug.cgi?id=32642
+
+        Also refactor output capturing code into
+        OutputCapture.assert_outputs to share more code between tests.
+
+        * Scripts/modules/buildsteps.py:
+         - Add the missing include.
+         - Give guess_reviewer_from_bug a private underscore.
+        * Scripts/modules/buildsteps_unittest.py: Added.
+         - Test to make sure _guess_reviewer_from_bug works as expected.
+        * Scripts/modules/commands/commandtest.py:
+         - Custom code is now obsoleted by OutputCapture.assert_outputs
+        * Scripts/modules/commands/queues_unittest.py:
+         - ditto
+        * Scripts/modules/credentials_unittest.py:
+         - ditto
+        * Scripts/modules/mock_bugzillatool.py:
+         - fetch_reviewed_patches_from_bug can never return None
+        * Scripts/modules/multicommandtool_unittest.py:
+         - Custom code is now obsoleted by OutputCapture.assert_outputs
+        * Scripts/modules/outputcapture.py:
+         - Add assert_outputs to share more code between tests.
+        * Scripts/run-webkit-unittests:
+         - Add buildsteps_unittest.py
+
 2009-12-16  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/modules/buildsteps.py

@@ -32 +32 @@
 
 from modules.comments import bug_comment_from_commit_text
+from modules.grammar import pluralize
 from modules.logging import log, error
 from modules.webkitport import WebKitPort
@@ -231 +232 @@
         ]
 
-    def guess_reviewer_from_bug(self, bug_id):
+    def _guess_reviewer_from_bug(self, bug_id):
         patches = self._tool.bugs.fetch_reviewed_patches_from_bug(bug_id)
         if len(patches) != 1:
@@ -248 +249 @@
                 log("No bug id provided and --reviewer= not provided.  Not updating ChangeLogs with reviewer.")
                 return
-            reviewer = self.guess_reviewer_from_bug(bug_id)
+            reviewer = self._guess_reviewer_from_bug(bug_id)
 
         if not reviewer:

trunk/WebKitTools/Scripts/modules/buildsteps_unittest.py

@@ -29 +29 @@
 import unittest
 
-from modules.mock import Mock
+from modules.buildsteps import UpdateChangelogsWithReviewerStep
 from modules.mock_bugzillatool import MockBugzillaTool
 from modules.outputcapture import OutputCapture
 
-class CommandsTest(unittest.TestCase):
-    def assert_execute_outputs(self, command, args, expected_stdout="", expected_stderr="", options=Mock(), tool=MockBugzillaTool()):
+class UpdateChangelogsWithReviewerStepTest(unittest.TestCase):
+    def test_guess_reviewer_from_bug(self):
         capture = OutputCapture()
-        capture.capture_output()
-        command.execute(options, args, tool)
-        (stdout_string, stderr_string) = capture.restore_output()
-        self.assertEqual(stdout_string, expected_stdout)
-        self.assertEqual(stderr_string, expected_stderr)
+        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)

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

@@ -35 +35 @@
 class CommandsTest(unittest.TestCase):
     def assert_execute_outputs(self, command, args, expected_stdout="", expected_stderr="", options=Mock(), tool=MockBugzillaTool()):
-        capture = OutputCapture()
-        capture.capture_output()
-        command.execute(options, args, tool)
-        (stdout_string, stderr_string) = capture.restore_output()
-        self.assertEqual(stdout_string, expected_stdout)
-        self.assertEqual(stderr_string, expected_stderr)
+        OutputCapture().assert_outputs(self, command.execute, [options, args, tool], expected_stdout=expected_stdout, expected_stderr=expected_stderr)

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

@@ -40 +40 @@
 
 class AbstractQueueTest(CommandsTest):
-    def _assert_output(self, function, args, expected_stdout="", expected_stderr=""):
-        capture = OutputCapture()
-        capture.capture_output()
-        function(*args)
-        (stdout_string, stderr_string) = capture.restore_output()
-        self.assertEqual(stdout_string, expected_stdout)
-        self.assertEqual(stderr_string, expected_stderr)
-
     def _assert_log_progress_output(self, patch_ids, progress_output):
-        self._assert_output(TestQueue().log_progress, [patch_ids], expected_stderr=progress_output)
+        OutputCapture().assert_outputs(self, TestQueue().log_progress, [patch_ids], expected_stderr=progress_output)
 
     def test_log_progress(self):

trunk/WebKitTools/Scripts/modules/credentials_unittest.py

@@ -76 +76 @@
         credentials = Credentials("example.com", executive=executive_mock)
 
-        output = OutputCapture()
-        output.capture_output()
-        credentials._run_security_tool(username)
-        (stdout_output, stderr_output) = output.restore_output()
-        self.assertEqual(stdout_output, "")
-        self.assertEqual(stderr_output, "Reading Keychain for example.com account and password.  Click \"Allow\" to continue...\n")
+        expected_stderr = "Reading Keychain for example.com account and password.  Click \"Allow\" to continue...\n"
+        OutputCapture().assert_outputs(self, credentials._run_security_tool, [username], expected_stderr=expected_stderr)
 
         security_args = ["/usr/bin/security", "find-internet-password", "-g", "-s", "example.com"]

trunk/WebKitTools/Scripts/modules/mock_bugzillatool.py

@@ -67 +67 @@
         if bug_id == 42:
             return [self.patch1, self.patch2]
-        return None
+        return []
 
     def fetch_attachments_from_bug(self, bug_id):

trunk/WebKitTools/Scripts/modules/multicommandtool_unittest.py

@@ -64 +64 @@
     def test_required_arguments(self):
         two_required_arguments = TrivialCommand(argument_names="ARG1 ARG2 [ARG3]")
-        capture = OutputCapture()
-        capture.capture_output()
-        exit_code = two_required_arguments.check_arguments_and_execute(["foo"], TrivialTool())
-        (stdout_string, stderr_string) = capture.restore_output()
         expected_missing_args_error = "2 arguments required, 1 argument provided.  Provided: 'foo'  Required: ARG1 ARG2\nSee 'trivial-tool help trivial' for usage.\n"
+        exit_code = OutputCapture().assert_outputs(self, two_required_arguments.check_arguments_and_execute, [["foo"], TrivialTool()], expected_stderr=expected_missing_args_error)
         self.assertEqual(exit_code, 1)
-        self.assertEqual(stdout_string, "")
-        self.assertEqual(stderr_string, expected_missing_args_error)
 
 
@@ -109 +104 @@
         self.assertEqual(tool.command_by_name("bar"), None)
 
-    def _assert_tool_main_outputs(self, tool, main_args, expected_stdout, expected_stderr = "", exit_code=0):
-        capture = OutputCapture()
-        capture.capture_output()
-        exit_code = tool.main(main_args)
-        (stdout_string, stderr_string) = capture.restore_output()
-        self.assertEqual(stdout_string, expected_stdout)
-        self.assertEqual(expected_stderr, expected_stderr)
+    def _assert_tool_main_outputs(self, tool, main_args, expected_stdout, expected_stderr = "", expected_exit_code=0):
+        exit_code = OutputCapture().assert_outputs(self, tool.main, [main_args], expected_stdout=expected_stdout, expected_stderr=expected_stderr)
+        self.assertEqual(exit_code, expected_exit_code)
 
     def test_global_help(self):

trunk/WebKitTools/Scripts/modules/outputcapture.py

@@ -52 +52 @@
     def restore_output(self):
         return (self._restore_output_with_name("stdout"), self._restore_output_with_name("stderr"))
+
+    def assert_outputs(self, testcase, function, args=[], kwargs={}, expected_stdout="", expected_stderr=""):
+        self.capture_output()
+        return_value = function(*args, **kwargs)
+        (stdout_string, stderr_string) = self.restore_output()
+        testcase.assertEqual(stdout_string, expected_stdout)
+        testcase.assertEqual(stderr_string, expected_stderr)
+        # This is a little strange, but I don't know where else to return this information.
+        return return_value

trunk/WebKitTools/Scripts/run-webkit-unittests

@@ -33 +33 @@
 from modules.bugzilla_unittest import *
 from modules.buildbot_unittest import *
+from modules.buildsteps_unittest import *
 from modules.changelogs_unittest import *
 from modules.commands.download_unittest import *