Merge lp:~cjwatson/launchpadlib/timeout-eventually into lp:launchpadlib

[Colin Watson]

Time out make_end_user_authorize_token after 15 minutes.

Time out make_end_user_authorize_token after 15 minutes.

This should at least slightly mitigate issues with misconfigured server jobs that never give up.

[Dimitri John Ledkov (xnox)]

lgtm

review: Approve

=== modified file 'src/launchpadlib/credentials.py'
--- src/launchpadlib/credentials.py	2014-11-08 12:26:25 +0000
+++ src/launchpadlib/credentials.py	2015-07-10 13:38:50 +0000
@@ -82,6 +82,7 @@
 access_token_page = '+access-token'
 authorize_token_page = '+authorize-token'
 access_token_poll_time = 1
+access_token_poll_timeout = 15 * 60
 
 EXPLOSIVE_ERRORS = (MemoryError, KeyboardInterrupt, SystemExit)
 
@@ -651,6 +652,7 @@
         self.output(self.WAITING_FOR_LAUNCHPAD)
         if browser is not None:
             webbrowser.open(authorization_url)
+        start_time = time.time()
         while credentials.access_token is None:
             time.sleep(access_token_poll_time)
             try:
@@ -669,6 +671,9 @@
                     # There was an error accessing the server.
                     print("Unexpected response from Launchpad:")
                     print(e)
+            if time.time() >= start_time + access_token_poll_timeout:
+                raise TokenAuthorizationTimedOut(
+                    "Timed out after %d seconds." % access_token_poll_timeout)
 
 
 class TokenAuthorizationException(Exception):
@@ -683,6 +688,10 @@
     pass
 
 
+class TokenAuthorizationTimedOut(TokenAuthorizationException):
+    pass
+
+
 class ClientError(TokenAuthorizationException):
     pass