Canonical SSO provider

Merge lp:~canonical-isd-hackers/canonical-identity-provider/acceptance-helpers-cleanup into lp:canonical-identity-provider/release

  1. acceptance-helpers-cleanup
  2. Merge into trunk
Proposed by Michael Foord
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: no longer in the source branch.
Merged at revision: 332
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/acceptance-helpers-cleanup
Merge into: lp:canonical-identity-provider/release
Diff against target: 619 lines (+55/-55)
44 files modified
fabtasks/development.py (+1/-1)
identityprovider/tests/acceptance/applications/create_multiple_apps.py (+1/-1)
identityprovider/tests/acceptance/applications/delete_app.py (+1/-1)
identityprovider/tests/acceptance/consumer/SREG_opt_out.py (+1/-1)
identityprovider/tests/acceptance/consumer/return_private_teams.py (+1/-1)
identityprovider/tests/acceptance/devices/add_device.py (+2/-2)
identityprovider/tests/acceptance/devices/add_two_devices.py (+2/-2)
identityprovider/tests/acceptance/devices/login.py (+4/-4)
identityprovider/tests/acceptance/devices/prefs.py (+2/-2)
identityprovider/tests/acceptance/devices/remove_device.py (+2/-2)
identityprovider/tests/acceptance/devices/rename_device.py (+2/-2)
identityprovider/tests/acceptance/edit/_authenticated_sites_u1.py (+1/-1)
identityprovider/tests/acceptance/edit/authenticated_sites_askubuntu.py (+1/-1)
identityprovider/tests/acceptance/edit/authenticated_sites_bitbucket.py (+1/-1)
identityprovider/tests/acceptance/edit/change_password_bad.py (+1/-1)
identityprovider/tests/acceptance/edit/edit_1_full_name.py (+1/-1)
identityprovider/tests/acceptance/edit/edit_2_preferred_email.py (+1/-1)
identityprovider/tests/acceptance/edit/edit_3_password.py (+1/-1)
identityprovider/tests/acceptance/edit/illegitimate_passwords.py (+1/-1)
identityprovider/tests/acceptance/edit/valid_change_password.py (+1/-1)
identityprovider/tests/acceptance/emails/_token_reuse.py (+1/-1)
identityprovider/tests/acceptance/emails/add_email_validation.py (+1/-1)
identityprovider/tests/acceptance/emails/doubled_email.py (+1/-1)
identityprovider/tests/acceptance/emails/email_token_link.py (+1/-1)
identityprovider/tests/acceptance/emails/email_verification.py (+1/-1)
identityprovider/tests/acceptance/emails/login_deleted.py (+1/-1)
identityprovider/tests/acceptance/emails/login_secondary.py (+1/-1)
identityprovider/tests/acceptance/emails/used_email.py (+1/-1)
identityprovider/tests/acceptance/emails/valid_address.py (+1/-1)
identityprovider/tests/acceptance/forgot_password/forgot_password_1_manual_token.py (+1/-1)
identityprovider/tests/acceptance/forgot_password/forgot_password_2_email_link.py (+1/-1)
identityprovider/tests/acceptance/forgot_password/forgot_password_3_token_reuse.py (+1/-1)
identityprovider/tests/acceptance/logout/launchpad_logout.py (+2/-2)
identityprovider/tests/acceptance/logout/logout_launchpad.py (+1/-1)
identityprovider/tests/acceptance/new_account/new_account_1_manual_token.py (+1/-1)
identityprovider/tests/acceptance/new_account/new_account_2_email_link.py (+1/-1)
identityprovider/tests/acceptance/new_account/new_account_3_duplicate_email.py (+1/-1)
identityprovider/tests/acceptance/new_account/new_account_4_token_reuse.py (+1/-1)
identityprovider/tests/acceptance/new_account/new_account_5_not_when_logged_in.py (+1/-1)
identityprovider/tests/acceptance/new_account/passwords_valid.py (+1/-1)
identityprovider/tests/acceptance/new_account/personless_account.py (+1/-1)
identityprovider/tests/acceptance/production_only_smoke_test.py (+1/-1)
identityprovider/tests/acceptance/root/login_wrong_password.py (+1/-1)
identityprovider/tests/acceptance/views_protected.py (+3/-3)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/acceptance-helpers-cleanup
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Approve
Review via email: mp+92791@code.launchpad.net

Commit message

Moves our acceptance test helpers into a shared directory.

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'fabtasks/development.py'
--- fabtasks/development.py 2012-02-13 13:19:09 +0000
+++ fabtasks/development.py 2012-02-13 17:41:20 +0000
@@ -46,7 +46,7 @@
46 debug = _is_true(debug)46 debug = _is_true(debug)
4747
48 cmd = ['DJANGO_SETTINGS_MODULE=django_project.settings PYTHONPATH=.',48 cmd = ['DJANGO_SETTINGS_MODULE=django_project.settings PYTHONPATH=.',
49 'sst-run -m canonical.isd.tests.sst']49 'sst-run']
50 if headless:50 if headless:
51 cmd.append('-x')51 cmd.append('-x')
52 if screenshot:52 if screenshot:
5353
=== modified file 'identityprovider/tests/acceptance/applications/create_multiple_apps.py'
--- identityprovider/tests/acceptance/applications/create_multiple_apps.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/applications/create_multiple_apps.py 2012-02-13 17:41:20 +0000
@@ -9,7 +9,7 @@
9from canonical.isd.tests.sst import config9from canonical.isd.tests.sst import config
10from sst.actions import *10from sst.actions import *
1111
12from identityprovider.tests.acceptance import _helpers as helpers12import helpers
1313
14PASSWORD = 'Admin007'14PASSWORD = 'Admin007'
15TOKEN_1 = 'chupacabra'15TOKEN_1 = 'chupacabra'
1616
=== modified file 'identityprovider/tests/acceptance/applications/delete_app.py'
--- identityprovider/tests/acceptance/applications/delete_app.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/applications/delete_app.py 2012-02-13 17:41:20 +0000
@@ -6,7 +6,7 @@
6from canonical.isd.tests.sst import config6from canonical.isd.tests.sst import config
7from sst.actions import *7from sst.actions import *
88
9from identityprovider.tests.acceptance import _helpers as helpers9import helpers
1010
11PASSWORD = 'Admin007'11PASSWORD = 'Admin007'
12TOKEN_NAME = 'Whatever'12TOKEN_NAME = 'Whatever'
1313
=== modified file 'identityprovider/tests/acceptance/consumer/SREG_opt_out.py'
--- identityprovider/tests/acceptance/consumer/SREG_opt_out.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/consumer/SREG_opt_out.py 2012-02-13 17:41:20 +0000
@@ -19,7 +19,7 @@
19from canonical.isd.tests.sst import config19from canonical.isd.tests.sst import config
20from sst.actions import *20from sst.actions import *
2121
22from identityprovider.tests.acceptance._helpers import *22from helpers import *
2323
24config.set_base_url_from_env()24config.set_base_url_from_env()
25skip_production()25skip_production()
2626
=== modified file 'identityprovider/tests/acceptance/consumer/return_private_teams.py'
--- identityprovider/tests/acceptance/consumer/return_private_teams.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/consumer/return_private_teams.py 2012-02-13 17:41:20 +0000
@@ -9,7 +9,7 @@
9from canonical.isd.tests.sst import config9from canonical.isd.tests.sst import config
10from sst.actions import *10from sst.actions import *
1111
12from identityprovider.tests.acceptance._helpers import *12from helpers import *
1313
14config.set_base_url_from_env()14config.set_base_url_from_env()
15skip_production()15skip_production()
1616
=== removed file 'identityprovider/tests/acceptance/devices/__init__.py'
=== modified file 'identityprovider/tests/acceptance/devices/add_device.py'
--- identityprovider/tests/acceptance/devices/add_device.py 2012-02-09 22:25:40 +0000
+++ identityprovider/tests/acceptance/devices/add_device.py 2012-02-13 17:41:20 +0000
@@ -3,8 +3,8 @@
3from oath import hotp3from oath import hotp
4from sst.actions import *4from sst.actions import *
55
6from identityprovider.tests.acceptance import _helpers as helpers6import helpers
7from identityprovider.tests.acceptance.devices._helpers import click_add_device_button, click_add_new_device_link7from devices import click_add_device_button, click_add_new_device_link
88
99
10config.set_base_url_from_env()10config.set_base_url_from_env()
1111
=== modified file 'identityprovider/tests/acceptance/devices/add_two_devices.py'
--- identityprovider/tests/acceptance/devices/add_two_devices.py 2012-02-13 12:53:35 +0000
+++ identityprovider/tests/acceptance/devices/add_two_devices.py 2012-02-13 17:41:20 +0000
@@ -3,8 +3,8 @@
3from oath import hotp3from oath import hotp
4from sst.actions import *4from sst.actions import *
55
6from identityprovider.tests.acceptance import _helpers as helpers6import helpers
7from _helpers import (7from devices import (
8 add_device, click_add_device_button, click_add_new_device_link8 add_device, click_add_device_button, click_add_new_device_link
9)9)
1010
1111
=== modified file 'identityprovider/tests/acceptance/devices/login.py'
--- identityprovider/tests/acceptance/devices/login.py 2012-02-09 22:25:40 +0000
+++ identityprovider/tests/acceptance/devices/login.py 2012-02-13 17:41:20 +0000
@@ -4,13 +4,13 @@
4from canonical.isd.tests.sst import config4from canonical.isd.tests.sst import config
5from sst.actions import *5from sst.actions import *
66
7from identityprovider.tests.acceptance.devices._helpers import add_device7from devices import add_device
8from identityprovider.tests.acceptance import _helpers as helpers8import helpers
99
10def enter_otp(otp):10def enter_otp(otp):
11 write_textfield('id_oath_token', otp)11 write_textfield('id_oath_token', otp)
12 click_button(get_element(type='submit'))12 click_button(get_element(type='submit'))
13 13
1414
15config.set_base_url_from_env()15config.set_base_url_from_env()
16# TODO: remove once staging / production have two-factor authentication16# TODO: remove once staging / production have two-factor authentication
@@ -45,7 +45,7 @@
4545
46# Check an error message is shown and we are not logged in46# Check an error message is shown and we are not logged in
47assert_url('/two_factor_auth')47assert_url('/two_factor_auth')
48assert_text(get_element(css_class='error'), 48assert_text(get_element(css_class='error'),
49 'Please enter a 6-digit or 8-digit one-time password.')49 'Please enter a 6-digit or 8-digit one-time password.')
5050
51# Enter a valid one time password51# Enter a valid one time password
5252
=== modified file 'identityprovider/tests/acceptance/devices/prefs.py'
--- identityprovider/tests/acceptance/devices/prefs.py 2012-02-09 22:25:40 +0000
+++ identityprovider/tests/acceptance/devices/prefs.py 2012-02-13 17:41:20 +0000
@@ -3,8 +3,8 @@
3from canonical.isd.tests.sst import config3from canonical.isd.tests.sst import config
4from sst.actions import *4from sst.actions import *
55
6from identityprovider.tests.acceptance.devices._helpers import add_device6from devices import add_device
7from identityprovider.tests.acceptance import _helpers as helpers7import helpers
88
99
10config.set_base_url_from_env()10config.set_base_url_from_env()
1111
=== modified file 'identityprovider/tests/acceptance/devices/remove_device.py'
--- identityprovider/tests/acceptance/devices/remove_device.py 2012-02-13 13:00:53 +0000
+++ identityprovider/tests/acceptance/devices/remove_device.py 2012-02-13 17:41:20 +0000
@@ -4,8 +4,8 @@
44
5from oath import hotp5from oath import hotp
66
7from identityprovider.tests.acceptance import _helpers as helpers7import helpers
8from identityprovider.tests.acceptance.devices._helpers import add_device8from devices import add_device
99
1010
11def click_remove_button():11def click_remove_button():
1212
=== modified file 'identityprovider/tests/acceptance/devices/rename_device.py'
--- identityprovider/tests/acceptance/devices/rename_device.py 2012-02-09 22:25:40 +0000
+++ identityprovider/tests/acceptance/devices/rename_device.py 2012-02-13 17:41:20 +0000
@@ -1,8 +1,8 @@
1from canonical.isd.tests.sst import config1from canonical.isd.tests.sst import config
2from sst.actions import *2from sst.actions import *
33
4from identityprovider.tests.acceptance import _helpers as helpers4import helpers
5from identityprovider.tests.acceptance.devices._helpers import (5from devices import (
6 add_device,6 add_device,
7 assert_device,7 assert_device,
8 assert_no_device,8 assert_no_device,
99
=== modified file 'identityprovider/tests/acceptance/edit/_authenticated_sites_u1.py'
--- identityprovider/tests/acceptance/edit/_authenticated_sites_u1.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/edit/_authenticated_sites_u1.py 2012-02-13 17:41:20 +0000
@@ -10,7 +10,7 @@
10from sst import actions10from sst import actions
11from sst.actions import *11from sst.actions import *
1212
13from identityprovider.tests.acceptance import _helpers as helpers13import helpers
1414
1515
16config.set_base_url_from_env(default_to='https://login.ubuntu.com/')16config.set_base_url_from_env(default_to='https://login.ubuntu.com/')
1717
=== modified file 'identityprovider/tests/acceptance/edit/authenticated_sites_askubuntu.py'
--- identityprovider/tests/acceptance/edit/authenticated_sites_askubuntu.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/edit/authenticated_sites_askubuntu.py 2012-02-13 17:41:20 +0000
@@ -6,7 +6,7 @@
6from sst import actions6from sst import actions
7from sst.actions import *7from sst.actions import *
88
9from identityprovider.tests.acceptance import _helpers as helpers9import helpers
1010
11# Interacting with external sites can take a long time11# Interacting with external sites can take a long time
12set_wait_timeout(20)12set_wait_timeout(20)
1313
=== modified file 'identityprovider/tests/acceptance/edit/authenticated_sites_bitbucket.py'
--- identityprovider/tests/acceptance/edit/authenticated_sites_bitbucket.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/edit/authenticated_sites_bitbucket.py 2012-02-13 17:41:20 +0000
@@ -6,7 +6,7 @@
6from sst import actions6from sst import actions
7from sst.actions import *7from sst.actions import *
88
9from identityprovider.tests.acceptance import _helpers as helpers9import helpers
1010
1111
12# Interacting with external sites can take a long time12# Interacting with external sites can take a long time
1313
=== modified file 'identityprovider/tests/acceptance/edit/change_password_bad.py'
--- identityprovider/tests/acceptance/edit/change_password_bad.py 2012-01-20 22:37:46 +0000
+++ identityprovider/tests/acceptance/edit/change_password_bad.py 2012-02-13 17:41:20 +0000
@@ -8,7 +8,7 @@
8from django.conf import settings8from django.conf import settings
9from sst.actions import *9from sst.actions import *
1010
11from identityprovider.tests.acceptance import _helpers as helpers11import helpers
1212
13# Set to Production, Staging, VPS, Developer etc..13# Set to Production, Staging, VPS, Developer etc..
14config.set_base_url_from_env()14config.set_base_url_from_env()
1515
=== modified file 'identityprovider/tests/acceptance/edit/edit_1_full_name.py'
--- identityprovider/tests/acceptance/edit/edit_1_full_name.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/edit/edit_1_full_name.py 2012-02-13 17:41:20 +0000
@@ -2,7 +2,7 @@
2from canonical.isd.tests.sst import config2from canonical.isd.tests.sst import config
3from sst.actions import *3from sst.actions import *
44
5from identityprovider.tests.acceptance import _helpers as helpers5import helpers
66
7config.set_base_url_from_env()7config.set_base_url_from_env()
88
99
=== modified file 'identityprovider/tests/acceptance/edit/edit_2_preferred_email.py'
--- identityprovider/tests/acceptance/edit/edit_2_preferred_email.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/edit/edit_2_preferred_email.py 2012-02-13 17:41:20 +0000
@@ -2,7 +2,7 @@
2from canonical.isd.tests.sst import mail, config2from canonical.isd.tests.sst import mail, config
3from sst.actions import *3from sst.actions import *
44
5from identityprovider.tests.acceptance import _helpers as helpers5import helpers
66
7config.set_base_url_from_env()7config.set_base_url_from_env()
88
99
=== modified file 'identityprovider/tests/acceptance/edit/edit_3_password.py'
--- identityprovider/tests/acceptance/edit/edit_3_password.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/edit/edit_3_password.py 2012-02-13 17:41:20 +0000
@@ -3,7 +3,7 @@
3from canonical.isd.tests.sst import config3from canonical.isd.tests.sst import config
4from sst.actions import *4from sst.actions import *
55
6from identityprovider.tests.acceptance import _helpers as helpers6import helpers
77
8config.set_base_url_from_env()8config.set_base_url_from_env()
99
1010
=== modified file 'identityprovider/tests/acceptance/edit/illegitimate_passwords.py'
--- identityprovider/tests/acceptance/edit/illegitimate_passwords.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/edit/illegitimate_passwords.py 2012-02-13 17:41:20 +0000
@@ -6,7 +6,7 @@
6from canonical.isd.tests.sst import mail, config6from canonical.isd.tests.sst import mail, config
7from sst.actions import *7from sst.actions import *
88
9from identityprovider.tests.acceptance import _helpers as helpers9import helpers
1010
11config.set_base_url_from_env()11config.set_base_url_from_env()
12NAME = 'Some Name'12NAME = 'Some Name'
1313
=== modified file 'identityprovider/tests/acceptance/edit/valid_change_password.py'
--- identityprovider/tests/acceptance/edit/valid_change_password.py 2012-01-20 22:37:46 +0000
+++ identityprovider/tests/acceptance/edit/valid_change_password.py 2012-02-13 17:41:20 +0000
@@ -8,7 +8,7 @@
8from django.conf import settings8from django.conf import settings
9from sst.actions import *9from sst.actions import *
1010
11from identityprovider.tests.acceptance import _helpers as helpers11import helpers
1212
13# Set to Production, Staging, VPS, Developer etc..13# Set to Production, Staging, VPS, Developer etc..
14config.set_base_url_from_env()14config.set_base_url_from_env()
1515
=== modified file 'identityprovider/tests/acceptance/emails/_token_reuse.py'
--- identityprovider/tests/acceptance/emails/_token_reuse.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/emails/_token_reuse.py 2012-02-13 17:41:20 +0000
@@ -1,7 +1,7 @@
1from canonical.isd.tests.sst import mail, config1from canonical.isd.tests.sst import mail, config
2from sst.actions import *2from sst.actions import *
33
4from identityprovider.tests.acceptance import _helpers as helpers4import helpers
55
6config.set_base_url_from_env()6config.set_base_url_from_env()
7NAME = 'Some Name'7NAME = 'Some Name'
88
=== modified file 'identityprovider/tests/acceptance/emails/add_email_validation.py'
--- identityprovider/tests/acceptance/emails/add_email_validation.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/emails/add_email_validation.py 2012-02-13 17:41:20 +0000
@@ -4,7 +4,7 @@
4from canonical.isd.tests.sst import config4from canonical.isd.tests.sst import config
5from sst.actions import *5from sst.actions import *
66
7from identityprovider.tests.acceptance import _helpers as helpers7import helpers
88
9config.set_base_url_from_env()9config.set_base_url_from_env()
1010
1111
=== modified file 'identityprovider/tests/acceptance/emails/doubled_email.py'
--- identityprovider/tests/acceptance/emails/doubled_email.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/emails/doubled_email.py 2012-02-13 17:41:20 +0000
@@ -1,7 +1,7 @@
1from canonical.isd.tests.sst import mail, config1from canonical.isd.tests.sst import mail, config
2from sst.actions import *2from sst.actions import *
33
4from identityprovider.tests.acceptance import _helpers as helpers4import helpers
55
6config.set_base_url_from_env()6config.set_base_url_from_env()
7NAME = 'Some Name'7NAME = 'Some Name'
88
=== modified file 'identityprovider/tests/acceptance/emails/email_token_link.py'
--- identityprovider/tests/acceptance/emails/email_token_link.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/emails/email_token_link.py 2012-02-13 17:41:20 +0000
@@ -3,7 +3,7 @@
3from canonical.isd.tests.sst import mail, config3from canonical.isd.tests.sst import mail, config
4from sst.actions import *4from sst.actions import *
55
6from identityprovider.tests.acceptance import _helpers as helpers6import helpers
77
8config.set_base_url_from_env()8config.set_base_url_from_env()
9NAME = 'Some Name'9NAME = 'Some Name'
1010
=== modified file 'identityprovider/tests/acceptance/emails/email_verification.py'
--- identityprovider/tests/acceptance/emails/email_verification.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/emails/email_verification.py 2012-02-13 17:41:20 +0000
@@ -4,7 +4,7 @@
4from canonical.isd.tests.sst import config4from canonical.isd.tests.sst import config
5from sst.actions import *5from sst.actions import *
66
7from identityprovider.tests.acceptance import _helpers as helpers7import helpers
88
9config.set_base_url_from_env()9config.set_base_url_from_env()
1010
1111
=== modified file 'identityprovider/tests/acceptance/emails/login_deleted.py'
--- identityprovider/tests/acceptance/emails/login_deleted.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/emails/login_deleted.py 2012-02-13 17:41:20 +0000
@@ -9,7 +9,7 @@
9from canonical.isd.tests.sst import mail, config9from canonical.isd.tests.sst import mail, config
10from sst.actions import *10from sst.actions import *
1111
12from identityprovider.tests.acceptance import _helpers as helpers12import helpers
1313
14config.set_base_url_from_env()14config.set_base_url_from_env()
15NAME = 'Some Name'15NAME = 'Some Name'
1616
=== modified file 'identityprovider/tests/acceptance/emails/login_secondary.py'
--- identityprovider/tests/acceptance/emails/login_secondary.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/emails/login_secondary.py 2012-02-13 17:41:20 +0000
@@ -7,7 +7,7 @@
7from canonical.isd.tests.sst import mail, config7from canonical.isd.tests.sst import mail, config
8from sst.actions import *8from sst.actions import *
99
10from identityprovider.tests.acceptance import _helpers as helpers10import helpers
1111
12config.set_base_url_from_env()12config.set_base_url_from_env()
13NAME = 'Some Name'13NAME = 'Some Name'
1414
=== modified file 'identityprovider/tests/acceptance/emails/used_email.py'
--- identityprovider/tests/acceptance/emails/used_email.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/emails/used_email.py 2012-02-13 17:41:20 +0000
@@ -1,7 +1,7 @@
1from canonical.isd.tests.sst import mail, config1from canonical.isd.tests.sst import mail, config
2from sst.actions import *2from sst.actions import *
33
4from identityprovider.tests.acceptance import _helpers as helpers4import helpers
55
6config.set_base_url_from_env()6config.set_base_url_from_env()
7NAME = 'Some Name'7NAME = 'Some Name'
88
=== modified file 'identityprovider/tests/acceptance/emails/valid_address.py'
--- identityprovider/tests/acceptance/emails/valid_address.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/emails/valid_address.py 2012-02-13 17:41:20 +0000
@@ -4,7 +4,7 @@
4from canonical.isd.tests.sst import mail, config4from canonical.isd.tests.sst import mail, config
5from sst.actions import *5from sst.actions import *
66
7from identityprovider.tests.acceptance import _helpers as helpers7import helpers
88
9config.set_base_url_from_env()9config.set_base_url_from_env()
10NAME = 'Some Name'10NAME = 'Some Name'
1111
=== modified file 'identityprovider/tests/acceptance/forgot_password/forgot_password_1_manual_token.py'
--- identityprovider/tests/acceptance/forgot_password/forgot_password_1_manual_token.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/forgot_password/forgot_password_1_manual_token.py 2012-02-13 17:41:20 +0000
@@ -3,7 +3,7 @@
3from canonical.isd.tests.sst import config3from canonical.isd.tests.sst import config
4from sst.actions import *4from sst.actions import *
55
6from identityprovider.tests.acceptance import _helpers as helpers6import helpers
77
8config.set_base_url_from_env()8config.set_base_url_from_env()
99
1010
=== modified file 'identityprovider/tests/acceptance/forgot_password/forgot_password_2_email_link.py'
--- identityprovider/tests/acceptance/forgot_password/forgot_password_2_email_link.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/forgot_password/forgot_password_2_email_link.py 2012-02-13 17:41:20 +0000
@@ -3,7 +3,7 @@
3from canonical.isd.tests.sst import config3from canonical.isd.tests.sst import config
4from sst.actions import *4from sst.actions import *
55
6from identityprovider.tests.acceptance import _helpers as helpers6import helpers
77
8config.set_base_url_from_env()8config.set_base_url_from_env()
99
1010
=== modified file 'identityprovider/tests/acceptance/forgot_password/forgot_password_3_token_reuse.py'
--- identityprovider/tests/acceptance/forgot_password/forgot_password_3_token_reuse.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/forgot_password/forgot_password_3_token_reuse.py 2012-02-13 17:41:20 +0000
@@ -3,7 +3,7 @@
3from canonical.isd.tests.sst import config3from canonical.isd.tests.sst import config
4from sst.actions import *4from sst.actions import *
55
6from identityprovider.tests.acceptance import _helpers as helpers6import helpers
77
8config.set_base_url_from_env()8config.set_base_url_from_env()
99
1010
=== modified file 'identityprovider/tests/acceptance/logout/launchpad_logout.py'
--- identityprovider/tests/acceptance/logout/launchpad_logout.py 2012-01-20 22:37:46 +0000
+++ identityprovider/tests/acceptance/logout/launchpad_logout.py 2012-02-13 17:41:20 +0000
@@ -3,12 +3,12 @@
3from canonical.isd.tests.sst import config3from canonical.isd.tests.sst import config
4from sst.actions import *4from sst.actions import *
55
6from identityprovider.tests.acceptance import _helpers as helpers6import helpers
77
8# Set to Production, Staging, VPS, Developer etc..8# Set to Production, Staging, VPS, Developer etc..
9config.set_base_url_from_env()9config.set_base_url_from_env()
1010
11# This test cannot run on VPS/Developer instances since it 11# This test cannot run on VPS/Developer instances since it
12# requires the full Launchpad.12# requires the full Launchpad.
13helpers.skip_local()13helpers.skip_local()
1414
1515
=== modified file 'identityprovider/tests/acceptance/logout/logout_launchpad.py'
--- identityprovider/tests/acceptance/logout/logout_launchpad.py 2012-01-26 20:28:39 +0000
+++ identityprovider/tests/acceptance/logout/logout_launchpad.py 2012-02-13 17:41:20 +0000
@@ -4,7 +4,7 @@
4from django.conf import settings4from django.conf import settings
5from sst.actions import *5from sst.actions import *
66
7from identityprovider.tests.acceptance import _helpers as helpers7import helpers
88
9# Set to Production, Staging, VPS, Developer etc..9# Set to Production, Staging, VPS, Developer etc..
10config.set_base_url_from_env()10config.set_base_url_from_env()
1111
=== modified file 'identityprovider/tests/acceptance/new_account/new_account_1_manual_token.py'
--- identityprovider/tests/acceptance/new_account/new_account_1_manual_token.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/new_account/new_account_1_manual_token.py 2012-02-13 17:41:20 +0000
@@ -3,7 +3,7 @@
3from canonical.isd.tests.sst import mail, config3from canonical.isd.tests.sst import mail, config
4from sst.actions import *4from sst.actions import *
55
6from identityprovider.tests.acceptance import _helpers as helpers6import helpers
77
8config.set_base_url_from_env()8config.set_base_url_from_env()
99
1010
=== modified file 'identityprovider/tests/acceptance/new_account/new_account_2_email_link.py'
--- identityprovider/tests/acceptance/new_account/new_account_2_email_link.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/new_account/new_account_2_email_link.py 2012-02-13 17:41:20 +0000
@@ -1,7 +1,7 @@
1from canonical.isd.tests.sst import mail, config1from canonical.isd.tests.sst import mail, config
2from sst.actions import *2from sst.actions import *
33
4from identityprovider.tests.acceptance import _helpers as helpers4import helpers
55
6config.set_base_url_from_env()6config.set_base_url_from_env()
77
88
=== modified file 'identityprovider/tests/acceptance/new_account/new_account_3_duplicate_email.py'
--- identityprovider/tests/acceptance/new_account/new_account_3_duplicate_email.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/new_account/new_account_3_duplicate_email.py 2012-02-13 17:41:20 +0000
@@ -1,7 +1,7 @@
1from canonical.isd.tests.sst import mail, config1from canonical.isd.tests.sst import mail, config
2from sst.actions import *2from sst.actions import *
33
4from identityprovider.tests.acceptance import _helpers as helpers4import helpers
55
6config.set_base_url_from_env()6config.set_base_url_from_env()
7email_address = helpers.register_account()7email_address = helpers.register_account()
88
=== modified file 'identityprovider/tests/acceptance/new_account/new_account_4_token_reuse.py'
--- identityprovider/tests/acceptance/new_account/new_account_4_token_reuse.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/new_account/new_account_4_token_reuse.py 2012-02-13 17:41:20 +0000
@@ -3,7 +3,7 @@
3from canonical.isd.tests.sst import mail, config3from canonical.isd.tests.sst import mail, config
4from sst.actions import *4from sst.actions import *
55
6from identityprovider.tests.acceptance import _helpers as helpers6import helpers
77
8config.set_base_url_from_env()8config.set_base_url_from_env()
99
1010
=== modified file 'identityprovider/tests/acceptance/new_account/new_account_5_not_when_logged_in.py'
--- identityprovider/tests/acceptance/new_account/new_account_5_not_when_logged_in.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/new_account/new_account_5_not_when_logged_in.py 2012-02-13 17:41:20 +0000
@@ -3,7 +3,7 @@
3from canonical.isd.tests.sst import config3from canonical.isd.tests.sst import config
4from sst.actions import *4from sst.actions import *
55
6from identityprovider.tests.acceptance import _helpers as helpers6import helpers
77
8config.set_base_url_from_env()8config.set_base_url_from_env()
99
1010
=== modified file 'identityprovider/tests/acceptance/new_account/passwords_valid.py'
--- identityprovider/tests/acceptance/new_account/passwords_valid.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/new_account/passwords_valid.py 2012-02-13 17:41:20 +0000
@@ -8,7 +8,7 @@
8from canonical.isd.tests.sst import mail, config8from canonical.isd.tests.sst import mail, config
9from sst.actions import *9from sst.actions import *
1010
11from identityprovider.tests.acceptance import _helpers as helpers11import helpers
1212
1313
14NAME = 'Some Name'14NAME = 'Some Name'
1515
=== modified file 'identityprovider/tests/acceptance/new_account/personless_account.py'
--- identityprovider/tests/acceptance/new_account/personless_account.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/new_account/personless_account.py 2012-02-13 17:41:20 +0000
@@ -14,7 +14,7 @@
14from canonical.isd.tests.sst import mail, config14from canonical.isd.tests.sst import mail, config
15from sst.actions import *15from sst.actions import *
1616
17from identityprovider.tests.acceptance import _helpers as helpers17import helpers
1818
19config.set_base_url_from_env()19config.set_base_url_from_env()
2020
2121
=== modified file 'identityprovider/tests/acceptance/production_only_smoke_test.py'
--- identityprovider/tests/acceptance/production_only_smoke_test.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/production_only_smoke_test.py 2012-02-13 17:41:20 +0000
@@ -7,7 +7,7 @@
7from canonical.isd.tests.sst import config7from canonical.isd.tests.sst import config
8from sst.actions import *8from sst.actions import *
99
10from identityprovider.tests.acceptance._helpers import logout, production_only10from helpers import logout, production_only
1111
12config.set_base_url_from_env()12config.set_base_url_from_env()
1313
1414
=== modified file 'identityprovider/tests/acceptance/root/login_wrong_password.py'
--- identityprovider/tests/acceptance/root/login_wrong_password.py 2012-01-13 14:49:47 +0000
+++ identityprovider/tests/acceptance/root/login_wrong_password.py 2012-02-13 17:41:20 +0000
@@ -4,7 +4,7 @@
4from canonical.isd.tests.sst import mail, config4from canonical.isd.tests.sst import mail, config
5from sst.actions import *5from sst.actions import *
66
7from identityprovider.tests.acceptance import _helpers as helpers7import helpers
88
99
10config.set_base_url_from_env()10config.set_base_url_from_env()
1111
=== added directory 'identityprovider/tests/acceptance/shared'
=== renamed file 'identityprovider/tests/acceptance/devices/_helpers.py' => 'identityprovider/tests/acceptance/shared/devices.py'
=== renamed file 'identityprovider/tests/acceptance/_helpers.py' => 'identityprovider/tests/acceptance/shared/helpers.py'
=== modified file 'identityprovider/tests/acceptance/views_protected.py'
--- identityprovider/tests/acceptance/views_protected.py 2012-02-09 19:05:10 +0000
+++ identityprovider/tests/acceptance/views_protected.py 2012-02-13 17:41:20 +0000
@@ -4,8 +4,8 @@
4from canonical.isd.tests.sst import config4from canonical.isd.tests.sst import config
5from sst.actions import *5from sst.actions import *
66
7import _helpers as helpers7import helpers
8from devices import _helpers as dev_helpers8import devices
99
10config.set_base_url_from_env()10config.set_base_url_from_env()
1111
@@ -18,7 +18,7 @@
1818
19 m.twofactor_password = 'Admin009'19 m.twofactor_password = 'Admin009'
20 m.twofactor_email = helpers.register_account(password=m.twofactor_password)20 m.twofactor_email = helpers.register_account(password=m.twofactor_password)
21 m.aes_key = dev_helpers.add_device()21 m.aes_key = devices.add_device()
22 # Change the preference to always require 2 factor authentication and save22 # Change the preference to always require 2 factor authentication and save
23 set_radio_value(get_element(tag="input", name="two-factor", value="always"))23 set_radio_value(get_element(tag="input", name="two-factor", value="always"))
24 click_button("authentication-prefs")24 click_button("authentication-prefs")