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
1=== modified file 'fabtasks/development.py'
2--- fabtasks/development.py 2012-02-13 13:19:09 +0000
3+++ fabtasks/development.py 2012-02-13 17:41:20 +0000
4@@ -46,7 +46,7 @@
5 debug = _is_true(debug)
6
7 cmd = ['DJANGO_SETTINGS_MODULE=django_project.settings PYTHONPATH=.',
8- 'sst-run -m canonical.isd.tests.sst']
9+ 'sst-run']
10 if headless:
11 cmd.append('-x')
12 if screenshot:
13
14=== modified file 'identityprovider/tests/acceptance/applications/create_multiple_apps.py'
15--- identityprovider/tests/acceptance/applications/create_multiple_apps.py 2012-01-13 14:49:47 +0000
16+++ identityprovider/tests/acceptance/applications/create_multiple_apps.py 2012-02-13 17:41:20 +0000
17@@ -9,7 +9,7 @@
18 from canonical.isd.tests.sst import config
19 from sst.actions import *
20
21-from identityprovider.tests.acceptance import _helpers as helpers
22+import helpers
23
24 PASSWORD = 'Admin007'
25 TOKEN_1 = 'chupacabra'
26
27=== modified file 'identityprovider/tests/acceptance/applications/delete_app.py'
28--- identityprovider/tests/acceptance/applications/delete_app.py 2012-01-13 14:49:47 +0000
29+++ identityprovider/tests/acceptance/applications/delete_app.py 2012-02-13 17:41:20 +0000
30@@ -6,7 +6,7 @@
31 from canonical.isd.tests.sst import config
32 from sst.actions import *
33
34-from identityprovider.tests.acceptance import _helpers as helpers
35+import helpers
36
37 PASSWORD = 'Admin007'
38 TOKEN_NAME = 'Whatever'
39
40=== modified file 'identityprovider/tests/acceptance/consumer/SREG_opt_out.py'
41--- identityprovider/tests/acceptance/consumer/SREG_opt_out.py 2012-01-13 14:49:47 +0000
42+++ identityprovider/tests/acceptance/consumer/SREG_opt_out.py 2012-02-13 17:41:20 +0000
43@@ -19,7 +19,7 @@
44 from canonical.isd.tests.sst import config
45 from sst.actions import *
46
47-from identityprovider.tests.acceptance._helpers import *
48+from helpers import *
49
50 config.set_base_url_from_env()
51 skip_production()
52
53=== modified file 'identityprovider/tests/acceptance/consumer/return_private_teams.py'
54--- identityprovider/tests/acceptance/consumer/return_private_teams.py 2012-01-13 14:49:47 +0000
55+++ identityprovider/tests/acceptance/consumer/return_private_teams.py 2012-02-13 17:41:20 +0000
56@@ -9,7 +9,7 @@
57 from canonical.isd.tests.sst import config
58 from sst.actions import *
59
60-from identityprovider.tests.acceptance._helpers import *
61+from helpers import *
62
63 config.set_base_url_from_env()
64 skip_production()
65
66=== removed file 'identityprovider/tests/acceptance/devices/__init__.py'
67=== modified file 'identityprovider/tests/acceptance/devices/add_device.py'
68--- identityprovider/tests/acceptance/devices/add_device.py 2012-02-09 22:25:40 +0000
69+++ identityprovider/tests/acceptance/devices/add_device.py 2012-02-13 17:41:20 +0000
70@@ -3,8 +3,8 @@
71 from oath import hotp
72 from sst.actions import *
73
74-from identityprovider.tests.acceptance import _helpers as helpers
75-from identityprovider.tests.acceptance.devices._helpers import click_add_device_button, click_add_new_device_link
76+import helpers
77+from devices import click_add_device_button, click_add_new_device_link
78
79
80 config.set_base_url_from_env()
81
82=== modified file 'identityprovider/tests/acceptance/devices/add_two_devices.py'
83--- identityprovider/tests/acceptance/devices/add_two_devices.py 2012-02-13 12:53:35 +0000
84+++ identityprovider/tests/acceptance/devices/add_two_devices.py 2012-02-13 17:41:20 +0000
85@@ -3,8 +3,8 @@
86 from oath import hotp
87 from sst.actions import *
88
89-from identityprovider.tests.acceptance import _helpers as helpers
90-from _helpers import (
91+import helpers
92+from devices import (
93 add_device, click_add_device_button, click_add_new_device_link
94 )
95
96
97=== modified file 'identityprovider/tests/acceptance/devices/login.py'
98--- identityprovider/tests/acceptance/devices/login.py 2012-02-09 22:25:40 +0000
99+++ identityprovider/tests/acceptance/devices/login.py 2012-02-13 17:41:20 +0000
100@@ -4,13 +4,13 @@
101 from canonical.isd.tests.sst import config
102 from sst.actions import *
103
104-from identityprovider.tests.acceptance.devices._helpers import add_device
105-from identityprovider.tests.acceptance import _helpers as helpers
106+from devices import add_device
107+import helpers
108
109 def enter_otp(otp):
110 write_textfield('id_oath_token', otp)
111 click_button(get_element(type='submit'))
112-
113+
114
115 config.set_base_url_from_env()
116 # TODO: remove once staging / production have two-factor authentication
117@@ -45,7 +45,7 @@
118
119 # Check an error message is shown and we are not logged in
120 assert_url('/two_factor_auth')
121-assert_text(get_element(css_class='error'),
122+assert_text(get_element(css_class='error'),
123 'Please enter a 6-digit or 8-digit one-time password.')
124
125 # Enter a valid one time password
126
127=== modified file 'identityprovider/tests/acceptance/devices/prefs.py'
128--- identityprovider/tests/acceptance/devices/prefs.py 2012-02-09 22:25:40 +0000
129+++ identityprovider/tests/acceptance/devices/prefs.py 2012-02-13 17:41:20 +0000
130@@ -3,8 +3,8 @@
131 from canonical.isd.tests.sst import config
132 from sst.actions import *
133
134-from identityprovider.tests.acceptance.devices._helpers import add_device
135-from identityprovider.tests.acceptance import _helpers as helpers
136+from devices import add_device
137+import helpers
138
139
140 config.set_base_url_from_env()
141
142=== modified file 'identityprovider/tests/acceptance/devices/remove_device.py'
143--- identityprovider/tests/acceptance/devices/remove_device.py 2012-02-13 13:00:53 +0000
144+++ identityprovider/tests/acceptance/devices/remove_device.py 2012-02-13 17:41:20 +0000
145@@ -4,8 +4,8 @@
146
147 from oath import hotp
148
149-from identityprovider.tests.acceptance import _helpers as helpers
150-from identityprovider.tests.acceptance.devices._helpers import add_device
151+import helpers
152+from devices import add_device
153
154
155 def click_remove_button():
156
157=== modified file 'identityprovider/tests/acceptance/devices/rename_device.py'
158--- identityprovider/tests/acceptance/devices/rename_device.py 2012-02-09 22:25:40 +0000
159+++ identityprovider/tests/acceptance/devices/rename_device.py 2012-02-13 17:41:20 +0000
160@@ -1,8 +1,8 @@
161 from canonical.isd.tests.sst import config
162 from sst.actions import *
163
164-from identityprovider.tests.acceptance import _helpers as helpers
165-from identityprovider.tests.acceptance.devices._helpers import (
166+import helpers
167+from devices import (
168 add_device,
169 assert_device,
170 assert_no_device,
171
172=== modified file 'identityprovider/tests/acceptance/edit/_authenticated_sites_u1.py'
173--- identityprovider/tests/acceptance/edit/_authenticated_sites_u1.py 2012-01-13 14:49:47 +0000
174+++ identityprovider/tests/acceptance/edit/_authenticated_sites_u1.py 2012-02-13 17:41:20 +0000
175@@ -10,7 +10,7 @@
176 from sst import actions
177 from sst.actions import *
178
179-from identityprovider.tests.acceptance import _helpers as helpers
180+import helpers
181
182
183 config.set_base_url_from_env(default_to='https://login.ubuntu.com/')
184
185=== modified file 'identityprovider/tests/acceptance/edit/authenticated_sites_askubuntu.py'
186--- identityprovider/tests/acceptance/edit/authenticated_sites_askubuntu.py 2012-01-13 14:49:47 +0000
187+++ identityprovider/tests/acceptance/edit/authenticated_sites_askubuntu.py 2012-02-13 17:41:20 +0000
188@@ -6,7 +6,7 @@
189 from sst import actions
190 from sst.actions import *
191
192-from identityprovider.tests.acceptance import _helpers as helpers
193+import helpers
194
195 # Interacting with external sites can take a long time
196 set_wait_timeout(20)
197
198=== modified file 'identityprovider/tests/acceptance/edit/authenticated_sites_bitbucket.py'
199--- identityprovider/tests/acceptance/edit/authenticated_sites_bitbucket.py 2012-01-13 14:49:47 +0000
200+++ identityprovider/tests/acceptance/edit/authenticated_sites_bitbucket.py 2012-02-13 17:41:20 +0000
201@@ -6,7 +6,7 @@
202 from sst import actions
203 from sst.actions import *
204
205-from identityprovider.tests.acceptance import _helpers as helpers
206+import helpers
207
208
209 # Interacting with external sites can take a long time
210
211=== modified file 'identityprovider/tests/acceptance/edit/change_password_bad.py'
212--- identityprovider/tests/acceptance/edit/change_password_bad.py 2012-01-20 22:37:46 +0000
213+++ identityprovider/tests/acceptance/edit/change_password_bad.py 2012-02-13 17:41:20 +0000
214@@ -8,7 +8,7 @@
215 from django.conf import settings
216 from sst.actions import *
217
218-from identityprovider.tests.acceptance import _helpers as helpers
219+import helpers
220
221 # Set to Production, Staging, VPS, Developer etc..
222 config.set_base_url_from_env()
223
224=== modified file 'identityprovider/tests/acceptance/edit/edit_1_full_name.py'
225--- identityprovider/tests/acceptance/edit/edit_1_full_name.py 2012-01-13 14:49:47 +0000
226+++ identityprovider/tests/acceptance/edit/edit_1_full_name.py 2012-02-13 17:41:20 +0000
227@@ -2,7 +2,7 @@
228 from canonical.isd.tests.sst import config
229 from sst.actions import *
230
231-from identityprovider.tests.acceptance import _helpers as helpers
232+import helpers
233
234 config.set_base_url_from_env()
235
236
237=== modified file 'identityprovider/tests/acceptance/edit/edit_2_preferred_email.py'
238--- identityprovider/tests/acceptance/edit/edit_2_preferred_email.py 2012-01-13 14:49:47 +0000
239+++ identityprovider/tests/acceptance/edit/edit_2_preferred_email.py 2012-02-13 17:41:20 +0000
240@@ -2,7 +2,7 @@
241 from canonical.isd.tests.sst import mail, config
242 from sst.actions import *
243
244-from identityprovider.tests.acceptance import _helpers as helpers
245+import helpers
246
247 config.set_base_url_from_env()
248
249
250=== modified file 'identityprovider/tests/acceptance/edit/edit_3_password.py'
251--- identityprovider/tests/acceptance/edit/edit_3_password.py 2012-01-13 14:49:47 +0000
252+++ identityprovider/tests/acceptance/edit/edit_3_password.py 2012-02-13 17:41:20 +0000
253@@ -3,7 +3,7 @@
254 from canonical.isd.tests.sst import config
255 from sst.actions import *
256
257-from identityprovider.tests.acceptance import _helpers as helpers
258+import helpers
259
260 config.set_base_url_from_env()
261
262
263=== modified file 'identityprovider/tests/acceptance/edit/illegitimate_passwords.py'
264--- identityprovider/tests/acceptance/edit/illegitimate_passwords.py 2012-01-13 14:49:47 +0000
265+++ identityprovider/tests/acceptance/edit/illegitimate_passwords.py 2012-02-13 17:41:20 +0000
266@@ -6,7 +6,7 @@
267 from canonical.isd.tests.sst import mail, config
268 from sst.actions import *
269
270-from identityprovider.tests.acceptance import _helpers as helpers
271+import helpers
272
273 config.set_base_url_from_env()
274 NAME = 'Some Name'
275
276=== modified file 'identityprovider/tests/acceptance/edit/valid_change_password.py'
277--- identityprovider/tests/acceptance/edit/valid_change_password.py 2012-01-20 22:37:46 +0000
278+++ identityprovider/tests/acceptance/edit/valid_change_password.py 2012-02-13 17:41:20 +0000
279@@ -8,7 +8,7 @@
280 from django.conf import settings
281 from sst.actions import *
282
283-from identityprovider.tests.acceptance import _helpers as helpers
284+import helpers
285
286 # Set to Production, Staging, VPS, Developer etc..
287 config.set_base_url_from_env()
288
289=== modified file 'identityprovider/tests/acceptance/emails/_token_reuse.py'
290--- identityprovider/tests/acceptance/emails/_token_reuse.py 2012-01-13 14:49:47 +0000
291+++ identityprovider/tests/acceptance/emails/_token_reuse.py 2012-02-13 17:41:20 +0000
292@@ -1,7 +1,7 @@
293 from canonical.isd.tests.sst import mail, config
294 from sst.actions import *
295
296-from identityprovider.tests.acceptance import _helpers as helpers
297+import helpers
298
299 config.set_base_url_from_env()
300 NAME = 'Some Name'
301
302=== modified file 'identityprovider/tests/acceptance/emails/add_email_validation.py'
303--- identityprovider/tests/acceptance/emails/add_email_validation.py 2012-01-13 14:49:47 +0000
304+++ identityprovider/tests/acceptance/emails/add_email_validation.py 2012-02-13 17:41:20 +0000
305@@ -4,7 +4,7 @@
306 from canonical.isd.tests.sst import config
307 from sst.actions import *
308
309-from identityprovider.tests.acceptance import _helpers as helpers
310+import helpers
311
312 config.set_base_url_from_env()
313
314
315=== modified file 'identityprovider/tests/acceptance/emails/doubled_email.py'
316--- identityprovider/tests/acceptance/emails/doubled_email.py 2012-01-13 14:49:47 +0000
317+++ identityprovider/tests/acceptance/emails/doubled_email.py 2012-02-13 17:41:20 +0000
318@@ -1,7 +1,7 @@
319 from canonical.isd.tests.sst import mail, config
320 from sst.actions import *
321
322-from identityprovider.tests.acceptance import _helpers as helpers
323+import helpers
324
325 config.set_base_url_from_env()
326 NAME = 'Some Name'
327
328=== modified file 'identityprovider/tests/acceptance/emails/email_token_link.py'
329--- identityprovider/tests/acceptance/emails/email_token_link.py 2012-01-13 14:49:47 +0000
330+++ identityprovider/tests/acceptance/emails/email_token_link.py 2012-02-13 17:41:20 +0000
331@@ -3,7 +3,7 @@
332 from canonical.isd.tests.sst import mail, config
333 from sst.actions import *
334
335-from identityprovider.tests.acceptance import _helpers as helpers
336+import helpers
337
338 config.set_base_url_from_env()
339 NAME = 'Some Name'
340
341=== modified file 'identityprovider/tests/acceptance/emails/email_verification.py'
342--- identityprovider/tests/acceptance/emails/email_verification.py 2012-01-13 14:49:47 +0000
343+++ identityprovider/tests/acceptance/emails/email_verification.py 2012-02-13 17:41:20 +0000
344@@ -4,7 +4,7 @@
345 from canonical.isd.tests.sst import config
346 from sst.actions import *
347
348-from identityprovider.tests.acceptance import _helpers as helpers
349+import helpers
350
351 config.set_base_url_from_env()
352
353
354=== modified file 'identityprovider/tests/acceptance/emails/login_deleted.py'
355--- identityprovider/tests/acceptance/emails/login_deleted.py 2012-01-13 14:49:47 +0000
356+++ identityprovider/tests/acceptance/emails/login_deleted.py 2012-02-13 17:41:20 +0000
357@@ -9,7 +9,7 @@
358 from canonical.isd.tests.sst import mail, config
359 from sst.actions import *
360
361-from identityprovider.tests.acceptance import _helpers as helpers
362+import helpers
363
364 config.set_base_url_from_env()
365 NAME = 'Some Name'
366
367=== modified file 'identityprovider/tests/acceptance/emails/login_secondary.py'
368--- identityprovider/tests/acceptance/emails/login_secondary.py 2012-01-13 14:49:47 +0000
369+++ identityprovider/tests/acceptance/emails/login_secondary.py 2012-02-13 17:41:20 +0000
370@@ -7,7 +7,7 @@
371 from canonical.isd.tests.sst import mail, config
372 from sst.actions import *
373
374-from identityprovider.tests.acceptance import _helpers as helpers
375+import helpers
376
377 config.set_base_url_from_env()
378 NAME = 'Some Name'
379
380=== modified file 'identityprovider/tests/acceptance/emails/used_email.py'
381--- identityprovider/tests/acceptance/emails/used_email.py 2012-01-13 14:49:47 +0000
382+++ identityprovider/tests/acceptance/emails/used_email.py 2012-02-13 17:41:20 +0000
383@@ -1,7 +1,7 @@
384 from canonical.isd.tests.sst import mail, config
385 from sst.actions import *
386
387-from identityprovider.tests.acceptance import _helpers as helpers
388+import helpers
389
390 config.set_base_url_from_env()
391 NAME = 'Some Name'
392
393=== modified file 'identityprovider/tests/acceptance/emails/valid_address.py'
394--- identityprovider/tests/acceptance/emails/valid_address.py 2012-01-13 14:49:47 +0000
395+++ identityprovider/tests/acceptance/emails/valid_address.py 2012-02-13 17:41:20 +0000
396@@ -4,7 +4,7 @@
397 from canonical.isd.tests.sst import mail, config
398 from sst.actions import *
399
400-from identityprovider.tests.acceptance import _helpers as helpers
401+import helpers
402
403 config.set_base_url_from_env()
404 NAME = 'Some Name'
405
406=== modified file 'identityprovider/tests/acceptance/forgot_password/forgot_password_1_manual_token.py'
407--- identityprovider/tests/acceptance/forgot_password/forgot_password_1_manual_token.py 2012-01-13 14:49:47 +0000
408+++ identityprovider/tests/acceptance/forgot_password/forgot_password_1_manual_token.py 2012-02-13 17:41:20 +0000
409@@ -3,7 +3,7 @@
410 from canonical.isd.tests.sst import config
411 from sst.actions import *
412
413-from identityprovider.tests.acceptance import _helpers as helpers
414+import helpers
415
416 config.set_base_url_from_env()
417
418
419=== modified file 'identityprovider/tests/acceptance/forgot_password/forgot_password_2_email_link.py'
420--- identityprovider/tests/acceptance/forgot_password/forgot_password_2_email_link.py 2012-01-13 14:49:47 +0000
421+++ identityprovider/tests/acceptance/forgot_password/forgot_password_2_email_link.py 2012-02-13 17:41:20 +0000
422@@ -3,7 +3,7 @@
423 from canonical.isd.tests.sst import config
424 from sst.actions import *
425
426-from identityprovider.tests.acceptance import _helpers as helpers
427+import helpers
428
429 config.set_base_url_from_env()
430
431
432=== modified file 'identityprovider/tests/acceptance/forgot_password/forgot_password_3_token_reuse.py'
433--- identityprovider/tests/acceptance/forgot_password/forgot_password_3_token_reuse.py 2012-01-13 14:49:47 +0000
434+++ identityprovider/tests/acceptance/forgot_password/forgot_password_3_token_reuse.py 2012-02-13 17:41:20 +0000
435@@ -3,7 +3,7 @@
436 from canonical.isd.tests.sst import config
437 from sst.actions import *
438
439-from identityprovider.tests.acceptance import _helpers as helpers
440+import helpers
441
442 config.set_base_url_from_env()
443
444
445=== modified file 'identityprovider/tests/acceptance/logout/launchpad_logout.py'
446--- identityprovider/tests/acceptance/logout/launchpad_logout.py 2012-01-20 22:37:46 +0000
447+++ identityprovider/tests/acceptance/logout/launchpad_logout.py 2012-02-13 17:41:20 +0000
448@@ -3,12 +3,12 @@
449 from canonical.isd.tests.sst import config
450 from sst.actions import *
451
452-from identityprovider.tests.acceptance import _helpers as helpers
453+import helpers
454
455 # Set to Production, Staging, VPS, Developer etc..
456 config.set_base_url_from_env()
457
458-# This test cannot run on VPS/Developer instances since it
459+# This test cannot run on VPS/Developer instances since it
460 # requires the full Launchpad.
461 helpers.skip_local()
462
463
464=== modified file 'identityprovider/tests/acceptance/logout/logout_launchpad.py'
465--- identityprovider/tests/acceptance/logout/logout_launchpad.py 2012-01-26 20:28:39 +0000
466+++ identityprovider/tests/acceptance/logout/logout_launchpad.py 2012-02-13 17:41:20 +0000
467@@ -4,7 +4,7 @@
468 from django.conf import settings
469 from sst.actions import *
470
471-from identityprovider.tests.acceptance import _helpers as helpers
472+import helpers
473
474 # Set to Production, Staging, VPS, Developer etc..
475 config.set_base_url_from_env()
476
477=== modified file 'identityprovider/tests/acceptance/new_account/new_account_1_manual_token.py'
478--- identityprovider/tests/acceptance/new_account/new_account_1_manual_token.py 2012-01-13 14:49:47 +0000
479+++ identityprovider/tests/acceptance/new_account/new_account_1_manual_token.py 2012-02-13 17:41:20 +0000
480@@ -3,7 +3,7 @@
481 from canonical.isd.tests.sst import mail, config
482 from sst.actions import *
483
484-from identityprovider.tests.acceptance import _helpers as helpers
485+import helpers
486
487 config.set_base_url_from_env()
488
489
490=== modified file 'identityprovider/tests/acceptance/new_account/new_account_2_email_link.py'
491--- identityprovider/tests/acceptance/new_account/new_account_2_email_link.py 2012-01-13 14:49:47 +0000
492+++ identityprovider/tests/acceptance/new_account/new_account_2_email_link.py 2012-02-13 17:41:20 +0000
493@@ -1,7 +1,7 @@
494 from canonical.isd.tests.sst import mail, config
495 from sst.actions import *
496
497-from identityprovider.tests.acceptance import _helpers as helpers
498+import helpers
499
500 config.set_base_url_from_env()
501
502
503=== modified file 'identityprovider/tests/acceptance/new_account/new_account_3_duplicate_email.py'
504--- identityprovider/tests/acceptance/new_account/new_account_3_duplicate_email.py 2012-01-13 14:49:47 +0000
505+++ identityprovider/tests/acceptance/new_account/new_account_3_duplicate_email.py 2012-02-13 17:41:20 +0000
506@@ -1,7 +1,7 @@
507 from canonical.isd.tests.sst import mail, config
508 from sst.actions import *
509
510-from identityprovider.tests.acceptance import _helpers as helpers
511+import helpers
512
513 config.set_base_url_from_env()
514 email_address = helpers.register_account()
515
516=== modified file 'identityprovider/tests/acceptance/new_account/new_account_4_token_reuse.py'
517--- identityprovider/tests/acceptance/new_account/new_account_4_token_reuse.py 2012-01-13 14:49:47 +0000
518+++ identityprovider/tests/acceptance/new_account/new_account_4_token_reuse.py 2012-02-13 17:41:20 +0000
519@@ -3,7 +3,7 @@
520 from canonical.isd.tests.sst import mail, config
521 from sst.actions import *
522
523-from identityprovider.tests.acceptance import _helpers as helpers
524+import helpers
525
526 config.set_base_url_from_env()
527
528
529=== modified file 'identityprovider/tests/acceptance/new_account/new_account_5_not_when_logged_in.py'
530--- identityprovider/tests/acceptance/new_account/new_account_5_not_when_logged_in.py 2012-01-13 14:49:47 +0000
531+++ identityprovider/tests/acceptance/new_account/new_account_5_not_when_logged_in.py 2012-02-13 17:41:20 +0000
532@@ -3,7 +3,7 @@
533 from canonical.isd.tests.sst import config
534 from sst.actions import *
535
536-from identityprovider.tests.acceptance import _helpers as helpers
537+import helpers
538
539 config.set_base_url_from_env()
540
541
542=== modified file 'identityprovider/tests/acceptance/new_account/passwords_valid.py'
543--- identityprovider/tests/acceptance/new_account/passwords_valid.py 2012-01-13 14:49:47 +0000
544+++ identityprovider/tests/acceptance/new_account/passwords_valid.py 2012-02-13 17:41:20 +0000
545@@ -8,7 +8,7 @@
546 from canonical.isd.tests.sst import mail, config
547 from sst.actions import *
548
549-from identityprovider.tests.acceptance import _helpers as helpers
550+import helpers
551
552
553 NAME = 'Some Name'
554
555=== modified file 'identityprovider/tests/acceptance/new_account/personless_account.py'
556--- identityprovider/tests/acceptance/new_account/personless_account.py 2012-01-13 14:49:47 +0000
557+++ identityprovider/tests/acceptance/new_account/personless_account.py 2012-02-13 17:41:20 +0000
558@@ -14,7 +14,7 @@
559 from canonical.isd.tests.sst import mail, config
560 from sst.actions import *
561
562-from identityprovider.tests.acceptance import _helpers as helpers
563+import helpers
564
565 config.set_base_url_from_env()
566
567
568=== modified file 'identityprovider/tests/acceptance/production_only_smoke_test.py'
569--- identityprovider/tests/acceptance/production_only_smoke_test.py 2012-01-13 14:49:47 +0000
570+++ identityprovider/tests/acceptance/production_only_smoke_test.py 2012-02-13 17:41:20 +0000
571@@ -7,7 +7,7 @@
572 from canonical.isd.tests.sst import config
573 from sst.actions import *
574
575-from identityprovider.tests.acceptance._helpers import logout, production_only
576+from helpers import logout, production_only
577
578 config.set_base_url_from_env()
579
580
581=== modified file 'identityprovider/tests/acceptance/root/login_wrong_password.py'
582--- identityprovider/tests/acceptance/root/login_wrong_password.py 2012-01-13 14:49:47 +0000
583+++ identityprovider/tests/acceptance/root/login_wrong_password.py 2012-02-13 17:41:20 +0000
584@@ -4,7 +4,7 @@
585 from canonical.isd.tests.sst import mail, config
586 from sst.actions import *
587
588-from identityprovider.tests.acceptance import _helpers as helpers
589+import helpers
590
591
592 config.set_base_url_from_env()
593
594=== added directory 'identityprovider/tests/acceptance/shared'
595=== renamed file 'identityprovider/tests/acceptance/devices/_helpers.py' => 'identityprovider/tests/acceptance/shared/devices.py'
596=== renamed file 'identityprovider/tests/acceptance/_helpers.py' => 'identityprovider/tests/acceptance/shared/helpers.py'
597=== modified file 'identityprovider/tests/acceptance/views_protected.py'
598--- identityprovider/tests/acceptance/views_protected.py 2012-02-09 19:05:10 +0000
599+++ identityprovider/tests/acceptance/views_protected.py 2012-02-13 17:41:20 +0000
600@@ -4,8 +4,8 @@
601 from canonical.isd.tests.sst import config
602 from sst.actions import *
603
604-import _helpers as helpers
605-from devices import _helpers as dev_helpers
606+import helpers
607+import devices
608
609 config.set_base_url_from_env()
610
611@@ -18,7 +18,7 @@
612
613 m.twofactor_password = 'Admin009'
614 m.twofactor_email = helpers.register_account(password=m.twofactor_password)
615- m.aes_key = dev_helpers.add_device()
616+ m.aes_key = devices.add_device()
617 # Change the preference to always require 2 factor authentication and save
618 set_radio_value(get_element(tag="input", name="two-factor", value="always"))
619 click_button("authentication-prefs")