Changeset 53925 in webkit

Timestamp:

Jan 27, 2010 5:01:03 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-27 Eric Seidel <​eric@webkit.org>

Reviewed by Darin Adler.

webkit-patch needs an open-bugs command
​https://bugs.webkit.org/show_bug.cgi?id=30793

• Scripts/test-webkitpy: import OpenBugsTest
• Scripts/webkit-patch: import OpenBugs
• Scripts/webkitpy/commands/download_unittest.py: don't import unittest
• Scripts/webkitpy/commands/early_warning_system_unittest.py: ditto
• Scripts/webkitpy/commands/queries_unittest.py: ditto
• Scripts/webkitpy/commands/queues_unittest.py: ditto
• Scripts/webkitpy/commands/upload_unittest.py: ditto
• Scripts/webkitpy/mock_bugzillatool.py: log when user.open_url is called.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/test-webkitpy (modified) (1 diff)
• Scripts/webkit-patch (modified) (1 diff)
• Scripts/webkitpy/commands/download_unittest.py (modified) (1 diff)
• Scripts/webkitpy/commands/early_warning_system_unittest.py (modified) (1 diff)
• Scripts/webkitpy/commands/openbugs.py (copied) (copied from trunk/WebKitTools/Scripts/test-webkitpy) (2 diffs, 1 prop)
• Scripts/webkitpy/commands/openbugs_unittest.py (added)
• Scripts/webkitpy/commands/queries_unittest.py (modified) (1 diff)
• Scripts/webkitpy/commands/queues_unittest.py (modified) (1 diff)
• Scripts/webkitpy/commands/upload_unittest.py (modified) (3 diffs)
• Scripts/webkitpy/mock_bugzillatool.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-27  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        webkit-patch needs an open-bugs command
+        https://bugs.webkit.org/show_bug.cgi?id=30793
+
+        * Scripts/test-webkitpy: import OpenBugsTest
+        * Scripts/webkit-patch: import OpenBugs
+        * Scripts/webkitpy/commands/download_unittest.py: don't import unittest
+        * Scripts/webkitpy/commands/early_warning_system_unittest.py: ditto
+        * Scripts/webkitpy/commands/queries_unittest.py: ditto
+        * Scripts/webkitpy/commands/queues_unittest.py: ditto
+        * Scripts/webkitpy/commands/upload_unittest.py: ditto
+        * Scripts/webkitpy/mock_bugzillatool.py: log when user.open_url is called.
+
 2010-01-27  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/WebKitTools/Scripts/test-webkitpy

@@ -36 +36 @@
 from webkitpy.commands.download_unittest import *
 from webkitpy.commands.early_warning_system_unittest import *
+from webkitpy.commands.openbugs_unittest import OpenBugsTest
 from webkitpy.commands.upload_unittest import *
 from webkitpy.commands.queries_unittest import *

trunk/WebKitTools/Scripts/webkit-patch

@@ -37 +37 @@
 from webkitpy.commands.download import *
 from webkitpy.commands.early_warning_system import *
+from webkitpy.commands.openbugs import OpenBugs
 from webkitpy.commands.queries import *
 from webkitpy.commands.queues import *

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

@@ -26 +26 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import unittest
 
 from webkitpy.commands.commandtest import CommandsTest

trunk/WebKitTools/Scripts/webkitpy/commands/early_warning_system_unittest.py

@@ -28 +28 @@
 
 import os
-import unittest
 
 from webkitpy.commands.early_warning_system import *

trunk/WebKitTools/Scripts/webkitpy/commands/openbugs.py

@@ -1 @@
-#!/usr/bin/env python
-# Copyright (c) 2009 Google Inc. All rights reserved.
+# Copyright (c) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28 +27 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import re
 import sys
-import unittest
 
-from webkitpy.bugzilla_unittest import *
-from webkitpy.buildbot_unittest import *
-from webkitpy.changelogs_unittest import *
-from webkitpy.commands.download_unittest import *
-from webkitpy.commands.early_warning_system_unittest import *
-from webkitpy.commands.upload_unittest import *
-from webkitpy.commands.queries_unittest import *
-from webkitpy.commands.queues_unittest import *
-from webkitpy.committers_unittest import *
-from webkitpy.credentials_unittest import *
-from webkitpy.diff_parser_unittest import *
-from webkitpy.executive_unittest import *
-from webkitpy.multicommandtool_unittest import *
-from webkitpy.networktransaction_unittest import *
-from webkitpy.patchcollection_unittest import *
-from webkitpy.queueengine_unittest import *
-from webkitpy.steps.steps_unittest import *
-from webkitpy.steps.closebugforlanddiff_unittest import *
-from webkitpy.steps.updatechangelogswithreview_unittests import *
-from webkitpy.style.unittests import * # for check-webkit-style
-from webkitpy.webkit_logging_unittest import *
-from webkitpy.webkitport_unittest import *
+from webkitpy.multicommandtool import AbstractDeclarativeCommand
+from webkitpy.webkit_logging import log
 
-if __name__ == "__main__":
-    # FIXME: This is a hack, but I'm tired of commenting out the test.
-    #        See https://bugs.webkit.org/show_bug.cgi?id=31818
-    if len(sys.argv) > 1 and sys.argv[1] == "--all":
-        sys.argv.remove("--all")
-        from webkitpy.scm_unittest import *
 
-    unittest.main()
+class OpenBugs(AbstractDeclarativeCommand):
+    name = "open-bugs"
+    help_text = "Finds all bug numbers passed in arguments (or stdin if no args provided) and opens them in a web browser"
+
+    bug_number_regexp = re.compile(r"\b\d{4,6}\b")
+
+    def _open_bugs(self, bug_ids):
+        for bug_id in bug_ids:
+            bug_url = self.tool.bugs.bug_url_for_bug_id(bug_id)
+            self.tool.user.open_url(bug_url)
+
+    # _find_bugs_in_string mostly exists for easy unit testing.
+    def _find_bugs_in_string(self, string):
+        return self.bug_number_regexp.findall(string)
+
+    def _find_bugs_in_iterable(self, iterable):
+        return sum([self._find_bugs_in_string(string) for string in iterable], [])
+
+    def execute(self, options, args, tool):
+        if args:
+            bug_ids = self._find_bugs_in_iterable(args)
+        else:
+            # This won't open bugs until stdin is closed but could be made to easily.  That would just make unit testing slightly harder.
+            bug_ids = self._find_bugs_in_iterable(sys.stdin)
+
+        log("%s bugs found in input." % len(bug_ids))
+
+        self._open_bugs(bug_ids)

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

@@ -26 +26 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import unittest
 
 from webkitpy.bugzilla import Bugzilla

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

@@ -28 +28 @@
 
 import os
-import unittest
 
 from webkitpy.commands.commandtest import CommandsTest

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

@@ -26 +26 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import unittest
 
 from webkitpy.commands.commandtest import CommandsTest
@@ -68 +66 @@
 
     def test_upload(self):
-        expected_stderr = "Running check-webkit-style\nObsoleting 2 old patches on bug 42\n"
+        expected_stderr = "Running check-webkit-style\nObsoleting 2 old patches on bug 42\nMOCK: user.open_url: http://example.com/42\n"
         self.assert_execute_outputs(Upload(), [42], expected_stderr=expected_stderr)
 
@@ -76 +74 @@
         options = Mock()
         options.bug_id = 42
-        expected_stderr = "Bug: <http://example.com/42> Bug with two r+'d and cq+'d patches, one of which has an invalid commit-queue setter.\nRevision: 9876\nAdding comment to Bug 42.\n"
+        expected_stderr = """Bug: <http://example.com/42> Bug with two r+'d and cq+'d patches, one of which has an invalid commit-queue setter.
+Revision: 9876
+MOCK: user.open_url: http://example.com/42
+Adding comment to Bug 42.
+"""
         self.assert_execute_outputs(MarkBugFixed(), [], expected_stderr=expected_stderr, tool=tool, options=options)
 

trunk/WebKitTools/Scripts/webkitpy/mock_bugzillatool.py

@@ -29 +29 @@
 import os
 
+from webkitpy.bugzilla import Bug, Attachment
+from webkitpy.committers import CommitterList, Reviewer
 from webkitpy.mock import Mock
 from webkitpy.scm import CommitMessage
-from webkitpy.committers import CommitterList, Reviewer
-from webkitpy.bugzilla import Bug, Attachment
+from webkitpy.webkit_logging import log
 
 
@@ -334 +335 @@
 
     def open_url(self, url):
+        log("MOCK: user.open_url: %s" % url)
         pass