Changeset 149630 in webkit

Timestamp:

May 6, 2013 12:49:08 PM (11 years ago)

Author:

ddkilzer@apple.com

Message:

webkit-patch: fix 'upload' command with Bugzilla 4.2.5
<​http://webkit.org/b/115667>

Reviewed by Dirk Pranke.

• Scripts/webkitpy/common/net/bugzilla/bugzilla.py:

(Bugzilla._check_create_bug_response): Update regex to work with
Bugzilla 3.2.3 and 4.2.5.

• Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py:

(testcheck_create_bug_response): Add new test that covers both
old and new <title> variations.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/net/bugzilla/bugzilla.py (modified) (1 diff)
• Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-05-06  David Kilzer  <ddkilzer@apple.com>
+
+        webkit-patch: fix 'upload' command with Bugzilla 4.2.5
+        <http://webkit.org/b/115667>
+
+        Reviewed by Dirk Pranke.
+
+        * Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
+        (Bugzilla._check_create_bug_response): Update regex to work with
+        Bugzilla 3.2.3 and 4.2.5.
+        * Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py:
+        (test__check_create_bug_response): Add new test that covers both
+        old and new <title> variations.
+
 2013-05-06  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py

@@ -630 +630 @@
     # FIXME: There has to be a more concise way to write this method.
     def _check_create_bug_response(self, response_html):
-        match = re.search("<title>Bug (?P<bug_id>\d+) Submitted</title>",
+        match = re.search("<title>Bug (?P<bug_id>\d+) Submitted[^<]*</title>",
                           response_html)
         if match:

trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py

@@ -336 +336 @@
         assert_commit_queue_flag(mark_for_landing=True, mark_for_commit_queue=False, expected='+', username='reviewer@webkit.org')
         assert_commit_queue_flag(mark_for_landing=True, mark_for_commit_queue=True, expected='+', username='reviewer@webkit.org')
+
+    def test__check_create_bug_response(self):
+        bugzilla = Bugzilla()
+
+        title_html_bugzilla_323 = "<title>Bug 101640 Submitted</title>"
+        self.assertEqual(bugzilla._check_create_bug_response(title_html_bugzilla_323), '101640')
+
+        title_html_bugzilla_425 = "<title>Bug 101640 Submitted &ndash; Testing webkit-patch again</title>"
+        self.assertEqual(bugzilla._check_create_bug_response(title_html_bugzilla_425), '101640')