Changeset 53733 in webkit

Timestamp:

Jan 22, 2010 4:12:12 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-01-21 Joe Mason <​jmason@rim.com>

Reviewed by Adam Barth.

webkit-patch should retry on invalid password
​https://bugs.webkit.org/show_bug.cgi?id=33955

Ask for bugs.webkit.org authentication in a loop.

• Scripts/webkitpy/bugzilla.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/bugzilla.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-21  Joe Mason  <jmason@rim.com>
+
+        Reviewed by Adam Barth.
+
+        webkit-patch should retry on invalid password
+        https://bugs.webkit.org/show_bug.cgi?id=33955
+
+        Ask for bugs.webkit.org authentication in a loop.
+
+        * Scripts/webkitpy/bugzilla.py:
+
 2010-01-22  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/bugzilla.py

@@ -1 @@
-# Copyright (c) 2009, Google Inc. All rights reserved.
+# Copyright (c) 2009 Google Inc. All rights reserved.
 # Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2010 Research In Motion Limited. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -467 +468 @@
             return
 
-        (username, password) = Credentials(
+        while not self.authenticated:
+            (username, password) = Credentials(
                 self.bug_server_host, git_prefix="bugzilla").read_credentials()
 
-        log("Logging in as %s..." % username)
-        self.browser.open(self.bug_server_url + "index.cgi?GoAheadAndLogIn=1")
-        self.browser.select_form(name="login")
-        self.browser['Bugzilla_login'] = username
-        self.browser['Bugzilla_password'] = password
-        response = self.browser.submit()
-
-        match = re.search("<title>(.+?)</title>", response.read())
-        # If the resulting page has a title, and it contains the word "invalid"
-        # assume it's the login failure page.
-        if match and re.search("Invalid", match.group(1), re.IGNORECASE):
-            # FIXME: We could add the ability to try again on failure.
-            raise Exception("Bugzilla login failed: %s" % match.group(1))
-
-        self.authenticated = True
+            log("Logging in as %s..." % username)
+            self.browser.open(self.bug_server_url +
+                              "index.cgi?GoAheadAndLogIn=1")
+            self.browser.select_form(name="login")
+            self.browser['Bugzilla_login'] = username
+            self.browser['Bugzilla_password'] = password
+            response = self.browser.submit()
+
+            match = re.search("<title>(.+?)</title>", response.read())
+            # If the resulting page has a title, and it contains the word
+            # "invalid" assume it's the login failure page.
+            if match and re.search("Invalid", match.group(1), re.IGNORECASE):
+                log("Bugzilla login failed: %s" % match.group(1))
+            else:
+                self.authenticated = True
 
     def _fill_attachment_form(self,