Merge lp:~elopio/ubuntuone-testing/logout-on-setup into lp:ubuntuone-testing

Proposed by Leo Arias
Status: Merged
Approved by: Rick McBride
Approved revision: 88
Merged at revision: 88
Proposed branch: lp:~elopio/ubuntuone-testing/logout-on-setup
Merge into: lp:ubuntuone-testing
Diff against target: 29 lines (+12/-0)
1 file modified
ubuntuone/web/tests/sst/shared/actions/setup.py (+12/-0)
To merge this branch: bzr merge lp:~elopio/ubuntuone-testing/logout-on-setup
Reviewer Review Type Date Requested Status
Rick McBride (community) Approve
Review via email: mp+99607@code.launchpad.net

Commit message

Make sure that no session is started.

To post a comment you must log in.
Revision history for this message
Rick McBride (rmcbride) wrote :

Oh. Good catch.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/web/tests/sst/shared/actions/setup.py'
2--- ubuntuone/web/tests/sst/shared/actions/setup.py 2012-03-21 22:18:47 +0000
3+++ ubuntuone/web/tests/sst/shared/actions/setup.py 2012-03-27 20:19:19 +0000
4@@ -39,6 +39,7 @@
5 """
6 set_wait_timeout(DEFAULT_TIMEOUT)
7 _go_to_ubuntu_one_home()
8+ _clear_previous_session()
9 if user is None:
10 user = _get_user_from_configuration(new_user)
11 _sign_up_or_login(new_user, user)
12@@ -62,6 +63,17 @@
13 skip('Unknown environment: %s.' % ENVIRONMENT)
14 return base_url
15
16+def _clear_previous_session():
17+ """A previous session might be started if the cache is not clean. This
18+ doesn't happen on Firefox because it always uses a new profile, but it
19+ happens on Internet Explorer because it keeps all data between executions.
20+
21+ """
22+ if header_actions.is_logged_in():
23+ header_actions.logout()
24+ sso_actions.assert_logout()
25+ _go_to_ubuntu_one_home()
26+
27 def _sign_up_or_login(new_user, user):
28 if new_user:
29 _sign_up(user)

Subscribers

People subscribed via source and target branches