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
=== modified file 'ubuntuone/web/tests/sst/shared/actions/setup.py'
--- ubuntuone/web/tests/sst/shared/actions/setup.py 2012-03-21 22:18:47 +0000
+++ ubuntuone/web/tests/sst/shared/actions/setup.py 2012-03-27 20:19:19 +0000
@@ -39,6 +39,7 @@
39 """39 """
40 set_wait_timeout(DEFAULT_TIMEOUT)40 set_wait_timeout(DEFAULT_TIMEOUT)
41 _go_to_ubuntu_one_home()41 _go_to_ubuntu_one_home()
42 _clear_previous_session()
42 if user is None:43 if user is None:
43 user = _get_user_from_configuration(new_user)44 user = _get_user_from_configuration(new_user)
44 _sign_up_or_login(new_user, user)45 _sign_up_or_login(new_user, user)
@@ -62,6 +63,17 @@
62 skip('Unknown environment: %s.' % ENVIRONMENT)63 skip('Unknown environment: %s.' % ENVIRONMENT)
63 return base_url64 return base_url
6465
66def _clear_previous_session():
67 """A previous session might be started if the cache is not clean. This
68 doesn't happen on Firefox because it always uses a new profile, but it
69 happens on Internet Explorer because it keeps all data between executions.
70
71 """
72 if header_actions.is_logged_in():
73 header_actions.logout()
74 sso_actions.assert_logout()
75 _go_to_ubuntu_one_home()
76
65def _sign_up_or_login(new_user, user):77def _sign_up_or_login(new_user, user):
66 if new_user:78 if new_user:
67 _sign_up(user)79 _sign_up(user)

Subscribers

People subscribed via source and target branches