Merge lp:~ralsina/ubuntu-sso-client/live-forever into lp:ubuntu-sso-client

Proposed by Roberto Alsina
Status: Merged
Approved by: Natalia Bidart
Approved revision: 741
Merged at revision: 738
Proposed branch: lp:~ralsina/ubuntu-sso-client/live-forever
Merge into: lp:ubuntu-sso-client
Diff against target: 20 lines (+2/-1)
1 file modified
ubuntu_sso/main/__init__.py (+2/-1)
To merge this branch: bzr merge lp:~ralsina/ubuntu-sso-client/live-forever
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Review via email: mp+68010@code.launchpad.net

Commit message

Set a different timeout for the windows port.

Description of the change

Set a different timeout for the windows port.

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/main/__init__.py'
2--- ubuntu_sso/main/__init__.py 2011-07-11 14:56:30 +0000
3+++ ubuntu_sso/main/__init__.py 2011-07-14 19:01:26 +0000
4@@ -33,7 +33,7 @@
5
6 logger = setup_logging("ubuntu_sso.main")
7 U1_PING_URL = "https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/"
8-TIMEOUT_INTERVAL = 1000000 # 10 seconds
9+TIMEOUT_INTERVAL = 10000 # 10 seconds
10
11
12 class SSOLoginProcessor(Account):
13@@ -409,6 +409,7 @@
14 SSOLogin = windows.SSOLogin
15 SSOCredentials = windows.SSOCredentials
16 CredentialsManagement = windows.CredentialsManagement
17+ TIMEOUT_INTERVAL = 10000000000 # forever
18 else:
19 from ubuntu_sso.main import linux
20 SSOLogin = linux.SSOLogin

Subscribers

People subscribed via source and target branches