Canonical SSO provider

Merge lp:~elopio/canonical-identity-provider/move_acceptance into lp:canonical-identity-provider/release

  1. move_acceptance
  2. Merge into trunk
Proposed by Leo Arias
Status: Merged
Approved by: Leo Arias
Approved revision: no longer in the source branch.
Merged at revision: 830
Proposed branch: lp:~elopio/canonical-identity-provider/move_acceptance
Merge into: lp:canonical-identity-provider/release
Diff against target: 1220 lines (+143/-143)
82 files modified
acceptance/apihelpers.py (+1/-1)
acceptance/base.py (+1/-1)
acceptance/devices.py (+1/-1)
acceptance/helpers.py (+1/-1)
acceptance/tests/api/account_details.py (+1/-1)
acceptance/tests/api/account_details_wrong_credentials.py (+1/-1)
acceptance/tests/api/email_already_registered.py (+2/-2)
acceptance/tests/api/email_invalidation_cancels_tokens.py (+1/-1)
acceptance/tests/api/login.py (+1/-1)
acceptance/tests/api/password_reset.py (+1/-1)
acceptance/tests/api/registration.py (+1/-1)
acceptance/tests/api/registration_captcha.py (+2/-2)
acceptance/tests/api/request_validation.py (+2/-2)
acceptance/tests/applications/create_multiple_apps.py (+1/-1)
acceptance/tests/applications/delete_app.py (+1/-1)
acceptance/tests/captcha/doesnt_disappear.py (+1/-1)
acceptance/tests/consumer/SREG_opt_out.py (+2/-2)
acceptance/tests/consumer/return_private_teams.py (+2/-2)
acceptance/tests/devices/add_device_google.py (+2/-2)
acceptance/tests/devices/add_device_paper.py (+2/-2)
acceptance/tests/devices/add_device_yubikey.py (+2/-2)
acceptance/tests/devices/add_two_devices.py (+2/-2)
acceptance/tests/devices/authentication_failure.py (+2/-2)
acceptance/tests/devices/delete_device.py (+2/-2)
acceptance/tests/devices/generate_paper_codes.py (+2/-2)
acceptance/tests/devices/login.py (+2/-2)
acceptance/tests/devices/rename_device.py (+2/-2)
acceptance/tests/devices/test_add_device.py (+1/-1)
acceptance/tests/devices/warn_about_backup_device.py (+2/-2)
acceptance/tests/edit/_authenticated_sites_u1.py (+1/-1)
acceptance/tests/edit/authenticated_sites_askubuntu.py (+1/-1)
acceptance/tests/edit/authenticated_sites_bitbucket.py (+1/-1)
acceptance/tests/edit/change_password_bad.py (+1/-1)
acceptance/tests/edit/devices_prefs.py (+2/-2)
acceptance/tests/edit/edit_1_full_name.py (+1/-1)
acceptance/tests/edit/edit_2_preferred_email.py (+1/-1)
acceptance/tests/edit/edit_3_password.py (+1/-1)
acceptance/tests/edit/edit_warn_about_backup_device.py (+2/-2)
acceptance/tests/edit/illegitimate_passwords.py (+1/-1)
acceptance/tests/edit/valid_change_password.py (+1/-1)
acceptance/tests/emails/_token_reuse.py (+1/-1)
acceptance/tests/emails/add_email_validation.py (+1/-1)
acceptance/tests/emails/change_preferred.py (+1/-1)
acceptance/tests/emails/doubled_email.py (+1/-1)
acceptance/tests/emails/email_token_link.py (+1/-1)
acceptance/tests/emails/email_verification.py (+1/-1)
acceptance/tests/emails/invalidate_link.py (+1/-1)
acceptance/tests/emails/login_deleted.py (+1/-1)
acceptance/tests/emails/login_secondary.py (+1/-1)
acceptance/tests/emails/resend_verification.py (+1/-1)
acceptance/tests/emails/used_email.py (+1/-1)
acceptance/tests/emails/valid_address.py (+1/-1)
acceptance/tests/forgot_password/forgot_password_1_manual_token.py (+1/-1)
acceptance/tests/forgot_password/forgot_password_2_email_link.py (+1/-1)
acceptance/tests/forgot_password/forgot_password_3_token_reuse.py (+1/-1)
acceptance/tests/logout/launchpad_logout.py (+1/-1)
acceptance/tests/logout/logout_deep_pages.py (+2/-2)
acceptance/tests/logout/logout_launchpad.py (+1/-1)
acceptance/tests/logout/logout_ubuntu.py (+1/-1)
acceptance/tests/new_account/check_captcha.py (+1/-1)
acceptance/tests/new_account/emails_invalid.py (+1/-1)
acceptance/tests/new_account/new_account_1_manual_token.py (+1/-1)
acceptance/tests/new_account/new_account_2_email_link.py (+1/-1)
acceptance/tests/new_account/new_account_3_duplicate_email.py (+1/-1)
acceptance/tests/new_account/new_account_4_token_reuse.py (+1/-1)
acceptance/tests/new_account/new_account_5_not_when_logged_in.py (+1/-1)
acceptance/tests/new_account/new_account_6_required_fields.py (+1/-1)
acceptance/tests/new_account/new_account_7_invalid_token.py (+1/-1)
acceptance/tests/new_account/new_account_8_confirmation_requires_login.py (+1/-1)
acceptance/tests/new_account/passwords_bad_client-side.py (+1/-1)
acceptance/tests/new_account/passwords_bad_server-side.py (+1/-1)
acceptance/tests/new_account/passwords_valid.py (+1/-1)
acceptance/tests/new_account/personless_account.py (+1/-1)
acceptance/tests/production_only_smoke_test.py (+1/-1)
acceptance/tests/root/link_logo.py (+1/-1)
acceptance/tests/root/links.py (+1/-1)
acceptance/tests/root/login_requireds.py (+1/-1)
acceptance/tests/root/login_wrong_password.py (+1/-1)
acceptance/tests/two_factor/check_username_display.py (+2/-2)
acceptance/tests/views_protected.py (+2/-2)
fabtasks/development.py (+1/-1)
tools/pyflakes.txt (+42/-42)
To merge this branch: bzr merge lp:~elopio/canonical-identity-provider/move_acceptance
Reviewer Review Type Date Requested Status
Michael Foord (community) Approve
Natalia Bidart (community) Approve
Ricardo Kirkner (community) Approve
Review via email: mp+162183@code.launchpad.net

Commit message

Move the acceptance tests to the root folder.

To post a comment you must log in.
Revision history for this message
Leo Arias (elopio) wrote :

I moved the acceptance tests from identityprovider.tests.acceptance to the acceptance package in the root directory.
I got rid of the shared folder, placing the helpers inside the acceptance package.
I moved the tests to acceptance.tests.

Now everything is a package, and the namespace matches the directory hierarcy.

And now tests are at the same level as the identityprovider and the webui packages, that's what they are testing.

Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

l. 866,879,944,996: you could seize the opportunity to sort the imports

other than that, looks good to me

review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks good! I like ti

review: Approve
Revision history for this message
Michael Foord (mfoord) wrote :

Great work.

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (70.4 KiB)

The attempt to merge lp:~elopio/canonical-identity-provider/move_acceptance into lp:canonical-identity-provider failed. Below is the output from the failed tests.

Updating download cache at dir /mnt/tarmac/isd-download-cache
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~canonical-isd-hackers/+junk/download-cache/
No revisions or tags to pull.
[localhost] local: which virtualenv
[localhost] local: /usr/bin/python /usr/bin/virtualenv --version
[localhost] local: /usr/bin/python /usr/bin/virtualenv --distribute --clear .env
Not deleting .env/bin
New python executable in .env/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
[localhost] local: dpkg -l libpq-dev 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l libxml2-dev 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l libxslt1-dev 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l memcached 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l postgresql-plpython-9.1 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l python-dev 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l python-m2crypto 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l swig 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l config-manager 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l python-egenix-mx-base-dev 2> /dev/null | grep '^ii' | wc -l
[localhost] local: rm -rf M2Crypto*
[localhost] local: ln -s /usr/lib/python2.7/dist-packages/M2Crypto* .
[localhost] local: /usr/lib/config-manager/cm.py update /tmp/tmp5mHDJs
[localhost] local: . /mnt/tarmac/cache/canonical-identity-provider/.env/bin/activate && make install PACKAGES="-r /mnt/tarmac/cache/canonical-identity-provider/requirements.txt"
pip install --find-links=file:///mnt/tarmac/isd-download-cache --no-index pip==dev
Ignoring indexes: http://pypi.python.org/simple/
Downloading/unpacking pip==dev
  Running setup.py egg_info for package pip

    warning: no files found matching '*.html' under directory 'docs'
    warning: no previously-included files matching '*.txt' found under directory 'docs/_build'
    no previously-included directories found matching 'docs/_build/_sources'
Installing collected packages: pip
  Found existing installation: pip 1.1
    Uninstalling pip:
      Successfully uninstalled pip
  Running setup.py install for pip

    warning: no files found matching '*.html' under directory 'docs'
    warning: no previously-included files matching '*.txt' found under directory 'docs/_build'
    no previously-included directories found matching 'docs/_build/_sources'
    Installing pip script to /mnt/tarmac/cache/canonical-identity-provider/.env/bin
    Installing pip-2.7 script to /mnt/tarmac/cache/canonical-identity-provider/.env/bin
Successfully installed pip
Cleaning up...
pip install --find-links=. --no-index -r /mnt/tarmac/cache/canonical-identity-provider/requirements.txt
Ignoring indexes: http://pypi.python.org/simple/
Down...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed directory 'identityprovider/tests/acceptance' => 'acceptance'
2=== renamed directory 'identityprovider/tests/acceptance/shared/actions' => 'acceptance/actions'
3=== renamed file 'identityprovider/tests/acceptance/shared/apihelpers.py' => 'acceptance/apihelpers.py'
4--- identityprovider/tests/acceptance/shared/apihelpers.py 2013-03-08 18:59:01 +0000
5+++ acceptance/apihelpers.py 2013-05-02 18:17:26 +0000
6@@ -1,7 +1,7 @@
7 from sst.actions import assert_equal
8 from u1testutils import mail
9
10-from identityprovider.tests.acceptance.shared import urls
11+from acceptance import urls
12 from ssoclient.v2 import V2ApiClient
13
14
15
16=== renamed file 'identityprovider/tests/acceptance/shared/base.py' => 'acceptance/base.py'
17--- identityprovider/tests/acceptance/shared/base.py 2013-04-25 16:33:18 +0000
18+++ acceptance/base.py 2013-05-02 18:17:26 +0000
19@@ -8,7 +8,7 @@
20 import sst.runtests
21 from u1testutils.sso import client, data
22
23-from identityprovider.tests.acceptance.shared import pages
24+from acceptance import pages
25
26
27 class IdentityProviderSSTTestCase(sst.runtests.SSTTestCase):
28
29=== renamed file 'identityprovider/tests/acceptance/shared/devices.py' => 'acceptance/devices.py'
30--- identityprovider/tests/acceptance/shared/devices.py 2013-01-25 17:46:04 +0000
31+++ acceptance/devices.py 2013-05-02 18:17:26 +0000
32@@ -22,7 +22,7 @@
33 write_textfield,
34 )
35
36-from identityprovider.tests.acceptance.shared import urls
37+from acceptance import urls
38
39
40 class Device(object):
41
42=== renamed file 'identityprovider/tests/acceptance/shared/helpers.py' => 'acceptance/helpers.py'
43--- identityprovider/tests/acceptance/shared/helpers.py 2013-04-24 07:25:44 +0000
44+++ acceptance/helpers.py 2013-05-02 18:17:26 +0000
45@@ -27,7 +27,7 @@
46 mail as sso_mail
47 )
48
49-from identityprovider.tests.acceptance.shared import devices, pages, urls
50+from acceptance import devices, pages, urls
51
52
53 def fail(msg):
54
55=== renamed file 'identityprovider/tests/acceptance/shared/pages.py' => 'acceptance/pages.py'
56=== added directory 'acceptance/tests'
57=== added file 'acceptance/tests/__init__.py'
58=== renamed directory 'identityprovider/tests/acceptance/api' => 'acceptance/tests/api'
59=== modified file 'acceptance/tests/api/account_details.py'
60--- identityprovider/tests/acceptance/api/account_details.py 2013-03-12 11:44:55 +0000
61+++ acceptance/tests/api/account_details.py 2013-05-02 18:17:26 +0000
62@@ -1,7 +1,7 @@
63 from sst.actions import assert_equal
64 from u1testutils.sst import config
65
66-from identityprovider.tests.acceptance.shared import apihelpers
67+from acceptance import apihelpers
68
69 config.set_base_url_from_env()
70 client = apihelpers.get_api_client()
71
72=== modified file 'acceptance/tests/api/account_details_wrong_credentials.py'
73--- identityprovider/tests/acceptance/api/account_details_wrong_credentials.py 2013-03-11 20:18:23 +0000
74+++ acceptance/tests/api/account_details_wrong_credentials.py 2013-05-02 18:17:26 +0000
75@@ -2,7 +2,7 @@
76 from u1testutils.sst import config
77
78 from ssoclient.v2 import ResourceNotFound
79-from identityprovider.tests.acceptance.shared import apihelpers, helpers
80+from acceptance import apihelpers, helpers
81
82
83 config.set_base_url_from_env()
84
85=== modified file 'acceptance/tests/api/email_already_registered.py'
86--- identityprovider/tests/acceptance/api/email_already_registered.py 2013-03-22 15:18:29 +0000
87+++ acceptance/tests/api/email_already_registered.py 2013-05-02 18:17:26 +0000
88@@ -4,8 +4,8 @@
89
90 from ssoclient.v2 import AlreadyRegistered
91
92-from identityprovider.tests.acceptance.shared import helpers
93-from identityprovider.tests.acceptance.shared.apihelpers import (
94+from acceptance import helpers
95+from acceptance.apihelpers import (
96 assert_api_error,
97 get_api_client,
98 register_new_test_account,
99
100=== modified file 'acceptance/tests/api/email_invalidation_cancels_tokens.py'
101--- identityprovider/tests/acceptance/api/email_invalidation_cancels_tokens.py 2013-04-12 17:01:33 +0000
102+++ acceptance/tests/api/email_invalidation_cancels_tokens.py 2013-05-02 18:17:26 +0000
103@@ -12,7 +12,7 @@
104 from u1testutils.sso import mail as sso_mail
105 from u1testutils.sst import config
106
107-from identityprovider.tests.acceptance.shared import (
108+from acceptance import (
109 apihelpers,
110 helpers,
111 urls,
112
113=== modified file 'acceptance/tests/api/login.py'
114--- identityprovider/tests/acceptance/api/login.py 2013-02-20 13:44:51 +0000
115+++ acceptance/tests/api/login.py 2013-05-02 18:17:26 +0000
116@@ -5,7 +5,7 @@
117 from u1testutils.sst import config
118
119 from ssoclient.v2 import InvalidCredentials
120-from identityprovider.tests.acceptance.shared import apihelpers, helpers
121+from acceptance import apihelpers, helpers
122
123
124 config.set_base_url_from_env()
125
126=== modified file 'acceptance/tests/api/password_reset.py'
127--- identityprovider/tests/acceptance/api/password_reset.py 2013-04-12 17:01:33 +0000
128+++ acceptance/tests/api/password_reset.py 2013-05-02 18:17:26 +0000
129@@ -3,7 +3,7 @@
130 from u1testutils.sso import mail
131 from u1testutils.sst import config
132
133-from identityprovider.tests.acceptance.shared import apihelpers, helpers
134+from acceptance import apihelpers, helpers
135
136
137 config.set_base_url_from_env()
138
139=== modified file 'acceptance/tests/api/registration.py'
140--- identityprovider/tests/acceptance/api/registration.py 2013-03-06 16:47:06 +0000
141+++ acceptance/tests/api/registration.py 2013-05-02 18:17:26 +0000
142@@ -1,7 +1,7 @@
143 from sst.actions import assert_equal, check_flags
144 from u1testutils import mail
145
146-from identityprovider.tests.acceptance.shared.apihelpers import get_api_client
147+from acceptance.apihelpers import get_api_client
148
149
150 check_flags('ALLOW_UNVERIFIED')
151
152=== modified file 'acceptance/tests/api/registration_captcha.py'
153--- identityprovider/tests/acceptance/api/registration_captcha.py 2013-03-22 15:18:29 +0000
154+++ acceptance/tests/api/registration_captcha.py 2013-05-02 18:17:26 +0000
155@@ -7,8 +7,8 @@
156
157 from ssoclient.v2 import CaptchaRequired
158
159-from identityprovider.tests.acceptance.shared import helpers
160-from identityprovider.tests.acceptance.shared.apihelpers import get_api_client
161+from acceptance import helpers
162+from acceptance.apihelpers import get_api_client
163
164
165 check_flags('CAPTCHA')
166
167=== modified file 'acceptance/tests/api/request_validation.py'
168--- identityprovider/tests/acceptance/api/request_validation.py 2013-03-12 11:44:55 +0000
169+++ acceptance/tests/api/request_validation.py 2013-05-02 18:17:26 +0000
170@@ -3,8 +3,8 @@
171 )
172
173 from identityprovider.tests.utils import authorization_header_from_token
174-from identityprovider.tests.acceptance.shared import urls
175-from identityprovider.tests.acceptance.shared.apihelpers import (
176+from acceptance import urls
177+from acceptance.apihelpers import (
178 get_api_client,
179 register_new_test_account,
180 )
181
182=== renamed directory 'identityprovider/tests/acceptance/applications' => 'acceptance/tests/applications'
183=== modified file 'acceptance/tests/applications/create_multiple_apps.py'
184--- identityprovider/tests/acceptance/applications/create_multiple_apps.py 2013-01-25 20:52:12 +0000
185+++ acceptance/tests/applications/create_multiple_apps.py 2013-05-02 18:17:26 +0000
186@@ -13,7 +13,7 @@
187 )
188 from u1testutils.sst import config
189
190-from identityprovider.tests.acceptance.shared import helpers, urls
191+from acceptance import helpers, urls
192
193
194 PASSWORD = 'Admin007'
195
196=== modified file 'acceptance/tests/applications/delete_app.py'
197--- identityprovider/tests/acceptance/applications/delete_app.py 2013-01-25 20:52:12 +0000
198+++ acceptance/tests/applications/delete_app.py 2013-05-02 18:17:26 +0000
199@@ -13,7 +13,7 @@
200 )
201 from u1testutils.sst import config
202
203-from identityprovider.tests.acceptance.shared import helpers, urls
204+from acceptance import helpers, urls
205
206
207 PASSWORD = 'Admin007'
208
209=== renamed directory 'identityprovider/tests/acceptance/captcha' => 'acceptance/tests/captcha'
210=== modified file 'acceptance/tests/captcha/doesnt_disappear.py'
211--- identityprovider/tests/acceptance/captcha/doesnt_disappear.py 2013-01-24 17:02:52 +0000
212+++ acceptance/tests/captcha/doesnt_disappear.py 2013-05-02 18:17:26 +0000
213@@ -10,7 +10,7 @@
214 )
215 from u1testutils.sst import config
216
217-from identityprovider.tests.acceptance.shared import helpers, urls
218+from acceptance import helpers, urls
219
220
221 helpers.skip_unless_staging_or_production()
222
223=== renamed directory 'identityprovider/tests/acceptance/consumer' => 'acceptance/tests/consumer'
224=== modified file 'acceptance/tests/consumer/SREG_opt_out.py'
225--- identityprovider/tests/acceptance/consumer/SREG_opt_out.py 2013-04-22 20:35:58 +0000
226+++ acceptance/tests/consumer/SREG_opt_out.py 2013-05-02 18:17:26 +0000
227@@ -36,8 +36,8 @@
228 )
229 from u1testutils.sst import config
230
231-from identityprovider.tests.acceptance.shared import urls
232-from identityprovider.tests.acceptance.shared.helpers import (
233+from acceptance import urls
234+from acceptance.helpers import (
235 is_staging,
236 skip,
237 skip_production,
238
239=== modified file 'acceptance/tests/consumer/return_private_teams.py'
240--- identityprovider/tests/acceptance/consumer/return_private_teams.py 2013-04-16 16:48:32 +0000
241+++ acceptance/tests/consumer/return_private_teams.py 2013-05-02 18:17:26 +0000
242@@ -23,8 +23,8 @@
243 )
244 from u1testutils.sst import config
245
246-from identityprovider.tests.acceptance.shared import urls
247-from identityprovider.tests.acceptance.shared.helpers import (
248+from acceptance import urls
249+from acceptance.helpers import (
250 is_staging,
251 login_from_redirect,
252 skip,
253
254=== renamed directory 'identityprovider/tests/acceptance/devices' => 'acceptance/tests/devices'
255=== modified file 'acceptance/tests/devices/add_device_google.py'
256--- identityprovider/tests/acceptance/devices/add_device_google.py 2013-01-24 17:02:52 +0000
257+++ acceptance/tests/devices/add_device_google.py 2013-05-02 18:17:26 +0000
258@@ -10,8 +10,8 @@
259 )
260 from u1testutils.sst import config
261
262-from identityprovider.tests.acceptance.shared import helpers
263-from identityprovider.tests.acceptance.shared.devices import (
264+from acceptance import helpers
265+from acceptance.devices import (
266 click_add_device_button,
267 click_add_new_device_link,
268 get_key_from_qrcode,
269
270=== modified file 'acceptance/tests/devices/add_device_paper.py'
271--- identityprovider/tests/acceptance/devices/add_device_paper.py 2013-01-24 17:02:52 +0000
272+++ acceptance/tests/devices/add_device_paper.py 2013-05-02 18:17:26 +0000
273@@ -12,8 +12,8 @@
274 )
275 from u1testutils.sst import config
276
277-from identityprovider.tests.acceptance.shared import helpers
278-from identityprovider.tests.acceptance.shared.devices import (
279+from acceptance import helpers
280+from acceptance.devices import (
281 click_add_device_button,
282 click_add_new_device_link,
283 store_paper_device,
284
285=== modified file 'acceptance/tests/devices/add_device_yubikey.py'
286--- identityprovider/tests/acceptance/devices/add_device_yubikey.py 2013-01-24 17:02:52 +0000
287+++ acceptance/tests/devices/add_device_yubikey.py 2013-05-02 18:17:26 +0000
288@@ -11,8 +11,8 @@
289 )
290 from u1testutils.sst import config
291
292-from identityprovider.tests.acceptance.shared import helpers
293-from identityprovider.tests.acceptance.shared.devices import (
294+from acceptance import helpers
295+from acceptance.devices import (
296 click_add_device_button,
297 click_add_new_device_link,
298 store_device,
299
300=== modified file 'acceptance/tests/devices/add_two_devices.py'
301--- identityprovider/tests/acceptance/devices/add_two_devices.py 2013-01-24 17:02:52 +0000
302+++ acceptance/tests/devices/add_two_devices.py 2013-05-02 18:17:26 +0000
303@@ -10,8 +10,8 @@
304 )
305 from u1testutils.sst import config
306
307-from identityprovider.tests.acceptance.shared import helpers, urls
308-from identityprovider.tests.acceptance.shared.devices import (
309+from acceptance import helpers, urls
310+from acceptance.devices import (
311 add_device,
312 authenticate,
313 click_add_device_button,
314
315=== modified file 'acceptance/tests/devices/authentication_failure.py'
316--- identityprovider/tests/acceptance/devices/authentication_failure.py 2013-01-25 15:59:36 +0000
317+++ acceptance/tests/devices/authentication_failure.py 2013-05-02 18:17:26 +0000
318@@ -7,8 +7,8 @@
319 )
320 from u1testutils.sst import config
321
322-from identityprovider.tests.acceptance.shared import helpers
323-from identityprovider.tests.acceptance.shared.devices import (
324+from acceptance import helpers
325+from acceptance.devices import (
326 add_device,
327 enter_otp,
328 )
329
330=== modified file 'acceptance/tests/devices/delete_device.py'
331--- identityprovider/tests/acceptance/devices/delete_device.py 2013-01-24 17:02:52 +0000
332+++ acceptance/tests/devices/delete_device.py 2013-05-02 18:17:26 +0000
333@@ -11,8 +11,8 @@
334 )
335 from u1testutils.sst import config
336
337-from identityprovider.tests.acceptance.shared import helpers, urls
338-from identityprovider.tests.acceptance.shared.devices import (
339+from acceptance import helpers, urls
340+from acceptance.devices import (
341 add_device,
342 authenticate,
343 click_delete_button,
344
345=== modified file 'acceptance/tests/devices/generate_paper_codes.py'
346--- identityprovider/tests/acceptance/devices/generate_paper_codes.py 2013-01-24 17:02:52 +0000
347+++ acceptance/tests/devices/generate_paper_codes.py 2013-05-02 18:17:26 +0000
348@@ -2,8 +2,8 @@
349 from sst.actions import *
350 from u1testutils.sst import config
351
352-from identityprovider.tests.acceptance.shared import helpers
353-from identityprovider.tests.acceptance.shared.devices import (
354+from acceptance import helpers
355+from acceptance.devices import (
356 click_add_device_button,
357 click_add_new_device_link,
358 enter_otp,
359
360=== modified file 'acceptance/tests/devices/login.py'
361--- identityprovider/tests/acceptance/devices/login.py 2013-01-24 17:02:52 +0000
362+++ acceptance/tests/devices/login.py 2013-05-02 18:17:26 +0000
363@@ -10,12 +10,12 @@
364 )
365 from u1testutils.sst import config
366
367-from identityprovider.tests.acceptance.shared.devices import (
368+from acceptance.devices import (
369 add_device,
370 authenticate,
371 enter_otp,
372 )
373-from identityprovider.tests.acceptance.shared import helpers
374+from acceptance import helpers
375
376
377 config.set_base_url_from_env()
378
379=== modified file 'acceptance/tests/devices/rename_device.py'
380--- identityprovider/tests/acceptance/devices/rename_device.py 2013-01-24 17:02:52 +0000
381+++ acceptance/tests/devices/rename_device.py 2013-05-02 18:17:26 +0000
382@@ -7,8 +7,8 @@
383 )
384 from u1testutils.sst import config
385
386-from identityprovider.tests.acceptance.shared import helpers
387-from identityprovider.tests.acceptance.shared.devices import (
388+from acceptance import helpers
389+from acceptance.devices import (
390 add_device,
391 assert_device,
392 assert_no_device,
393
394=== modified file 'acceptance/tests/devices/test_add_device.py'
395--- identityprovider/tests/acceptance/devices/test_add_device.py 2013-04-24 20:36:29 +0000
396+++ acceptance/tests/devices/test_add_device.py 2013-05-02 18:17:26 +0000
397@@ -8,7 +8,7 @@
398
399 from oath import hotp
400
401-from identityprovider.tests.acceptance.shared import base
402+from acceptance import base
403
404
405 class TestAddDevice(base.SSTTestCaseWithLogIn):
406
407=== modified file 'acceptance/tests/devices/warn_about_backup_device.py'
408--- identityprovider/tests/acceptance/devices/warn_about_backup_device.py 2013-01-24 17:02:52 +0000
409+++ acceptance/tests/devices/warn_about_backup_device.py 2013-05-02 18:17:26 +0000
410@@ -6,11 +6,11 @@
411 )
412 from u1testutils.sst import config
413
414-from identityprovider.tests.acceptance.shared.devices import (
415+from acceptance.devices import (
416 add_device,
417 delete_device,
418 )
419-from identityprovider.tests.acceptance.shared import helpers, urls
420+from acceptance import helpers, urls
421
422
423 # setup
424
425=== renamed directory 'identityprovider/tests/acceptance/edit' => 'acceptance/tests/edit'
426=== modified file 'acceptance/tests/edit/_authenticated_sites_u1.py'
427--- identityprovider/tests/acceptance/edit/_authenticated_sites_u1.py 2013-01-24 17:02:52 +0000
428+++ acceptance/tests/edit/_authenticated_sites_u1.py 2013-05-02 18:17:26 +0000
429@@ -17,7 +17,7 @@
430 )
431 from u1testutils.sst import config
432
433-from identityprovider.tests.acceptance.shared import helpers, urls
434+from acceptance import helpers, urls
435
436
437 config.set_base_url_from_env(default_to='https://login.ubuntu.com/')
438
439=== modified file 'acceptance/tests/edit/authenticated_sites_askubuntu.py'
440--- identityprovider/tests/acceptance/edit/authenticated_sites_askubuntu.py 2013-01-25 20:52:12 +0000
441+++ acceptance/tests/edit/authenticated_sites_askubuntu.py 2013-05-02 18:17:26 +0000
442@@ -18,7 +18,7 @@
443 )
444 from u1testutils.sst import config
445
446-from identityprovider.tests.acceptance.shared import helpers, urls
447+from acceptance import helpers, urls
448
449
450 # Interacting with external sites can take a long time
451
452=== modified file 'acceptance/tests/edit/authenticated_sites_bitbucket.py'
453--- identityprovider/tests/acceptance/edit/authenticated_sites_bitbucket.py 2013-02-22 20:03:33 +0000
454+++ acceptance/tests/edit/authenticated_sites_bitbucket.py 2013-05-02 18:17:26 +0000
455@@ -17,7 +17,7 @@
456 )
457 from u1testutils.sst import config
458
459-from identityprovider.tests.acceptance.shared import helpers, urls
460+from acceptance import helpers, urls
461
462
463 # Interacting with external sites can take a long time
464
465=== modified file 'acceptance/tests/edit/change_password_bad.py'
466--- identityprovider/tests/acceptance/edit/change_password_bad.py 2013-04-22 20:35:58 +0000
467+++ acceptance/tests/edit/change_password_bad.py 2013-05-02 18:17:26 +0000
468@@ -12,7 +12,7 @@
469 )
470 from u1testutils.sst import config
471
472-from identityprovider.tests.acceptance.shared import helpers
473+from acceptance import helpers
474
475
476 # Set to Production, Staging, VPS, Developer etc..
477
478=== modified file 'acceptance/tests/edit/devices_prefs.py'
479--- identityprovider/tests/acceptance/edit/devices_prefs.py 2013-02-22 20:03:33 +0000
480+++ acceptance/tests/edit/devices_prefs.py 2013-05-02 18:17:26 +0000
481@@ -12,13 +12,13 @@
482 )
483 from u1testutils.sst import config
484
485-from identityprovider.tests.acceptance.shared.devices import (
486+from acceptance.devices import (
487 add_device,
488 authenticate,
489 delete_device,
490 )
491
492-from identityprovider.tests.acceptance.shared import helpers, urls
493+from acceptance import helpers, urls
494
495
496 def get_device_preferences_elements():
497
498=== modified file 'acceptance/tests/edit/edit_1_full_name.py'
499--- identityprovider/tests/acceptance/edit/edit_1_full_name.py 2013-01-24 17:02:52 +0000
500+++ acceptance/tests/edit/edit_1_full_name.py 2013-05-02 18:17:26 +0000
501@@ -8,7 +8,7 @@
502 )
503 from u1testutils.sst import config
504
505-from identityprovider.tests.acceptance.shared import helpers, urls
506+from acceptance import helpers, urls
507
508
509 config.set_base_url_from_env()
510
511=== modified file 'acceptance/tests/edit/edit_2_preferred_email.py'
512--- identityprovider/tests/acceptance/edit/edit_2_preferred_email.py 2013-02-04 17:07:22 +0000
513+++ acceptance/tests/edit/edit_2_preferred_email.py 2013-05-02 18:17:26 +0000
514@@ -10,7 +10,7 @@
515 from u1testutils import mail
516 from u1testutils.sst import config
517
518-from identityprovider.tests.acceptance.shared import helpers, urls
519+from acceptance import helpers, urls
520
521
522 config.set_base_url_from_env()
523
524=== modified file 'acceptance/tests/edit/edit_3_password.py'
525--- identityprovider/tests/acceptance/edit/edit_3_password.py 2013-01-24 17:02:52 +0000
526+++ acceptance/tests/edit/edit_3_password.py 2013-05-02 18:17:26 +0000
527@@ -9,7 +9,7 @@
528 )
529 from u1testutils.sst import config
530
531-from identityprovider.tests.acceptance.shared import helpers, urls
532+from acceptance import helpers, urls
533
534
535 config.set_base_url_from_env()
536
537=== modified file 'acceptance/tests/edit/edit_warn_about_backup_device.py'
538--- identityprovider/tests/acceptance/edit/edit_warn_about_backup_device.py 2013-01-24 17:02:52 +0000
539+++ acceptance/tests/edit/edit_warn_about_backup_device.py 2013-05-02 18:17:26 +0000
540@@ -9,12 +9,12 @@
541 )
542 from u1testutils.sst import config
543
544-from identityprovider.tests.acceptance.shared.devices import (
545+from acceptance.devices import (
546 add_device,
547 delete_device,
548 )
549
550-from identityprovider.tests.acceptance.shared import helpers, urls
551+from acceptance import helpers, urls
552
553
554 # setup
555
556=== modified file 'acceptance/tests/edit/illegitimate_passwords.py'
557--- identityprovider/tests/acceptance/edit/illegitimate_passwords.py 2013-01-30 18:16:50 +0000
558+++ acceptance/tests/edit/illegitimate_passwords.py 2013-05-02 18:17:26 +0000
559@@ -16,7 +16,7 @@
560 from u1testutils import mail
561 from u1testutils.sst import config
562
563-from identityprovider.tests.acceptance.shared import helpers
564+from acceptance import helpers
565
566
567 config.set_base_url_from_env()
568
569=== modified file 'acceptance/tests/edit/valid_change_password.py'
570--- identityprovider/tests/acceptance/edit/valid_change_password.py 2013-04-22 20:35:58 +0000
571+++ acceptance/tests/edit/valid_change_password.py 2013-05-02 18:17:26 +0000
572@@ -13,7 +13,7 @@
573 )
574 from u1testutils.sst import config
575
576-from identityprovider.tests.acceptance.shared import helpers
577+from acceptance import helpers
578
579
580 # Set to Production, Staging, VPS, Developer etc..
581
582=== renamed directory 'identityprovider/tests/acceptance/emails' => 'acceptance/tests/emails'
583=== modified file 'acceptance/tests/emails/_token_reuse.py'
584--- identityprovider/tests/acceptance/emails/_token_reuse.py 2013-01-30 18:16:50 +0000
585+++ acceptance/tests/emails/_token_reuse.py 2013-05-02 18:17:26 +0000
586@@ -5,7 +5,7 @@
587 from u1testutils import mail
588 from u1testutils.sst import config
589
590-from identityprovider.tests.acceptance.shared import helpers
591+from acceptance import helpers
592
593
594 config.set_base_url_from_env()
595
596=== modified file 'acceptance/tests/emails/add_email_validation.py'
597--- identityprovider/tests/acceptance/emails/add_email_validation.py 2013-01-24 17:02:52 +0000
598+++ acceptance/tests/emails/add_email_validation.py 2013-05-02 18:17:26 +0000
599@@ -13,7 +13,7 @@
600 )
601 from u1testutils.sst import config
602
603-from identityprovider.tests.acceptance.shared import helpers, urls
604+from acceptance import helpers, urls
605
606
607 config.set_base_url_from_env()
608
609=== modified file 'acceptance/tests/emails/change_preferred.py'
610--- identityprovider/tests/acceptance/emails/change_preferred.py 2013-02-04 17:07:22 +0000
611+++ acceptance/tests/emails/change_preferred.py 2013-05-02 18:17:26 +0000
612@@ -7,7 +7,7 @@
613 from u1testutils import mail
614 from u1testutils.sst import config
615
616-from identityprovider.tests.acceptance.shared import helpers, urls
617+from acceptance import helpers, urls
618
619
620 config.set_base_url_from_env()
621
622=== modified file 'acceptance/tests/emails/doubled_email.py'
623--- identityprovider/tests/acceptance/emails/doubled_email.py 2013-01-30 18:16:50 +0000
624+++ acceptance/tests/emails/doubled_email.py 2013-05-02 18:17:26 +0000
625@@ -6,7 +6,7 @@
626 from u1testutils import mail
627 from u1testutils.sst import config
628
629-from identityprovider.tests.acceptance.shared import helpers
630+from acceptance import helpers
631
632 config.set_base_url_from_env()
633 PASSWORD = 'Admin007'
634
635=== modified file 'acceptance/tests/emails/email_token_link.py'
636--- identityprovider/tests/acceptance/emails/email_token_link.py 2013-04-12 17:01:33 +0000
637+++ acceptance/tests/emails/email_token_link.py 2013-05-02 18:17:26 +0000
638@@ -12,7 +12,7 @@
639 from u1testutils.sso import mail as sso_mail
640 from u1testutils.sst import config
641
642-from identityprovider.tests.acceptance.shared import helpers, urls
643+from acceptance import helpers, urls
644
645
646 config.set_base_url_from_env()
647
648=== modified file 'acceptance/tests/emails/email_verification.py'
649--- identityprovider/tests/acceptance/emails/email_verification.py 2013-01-24 17:02:52 +0000
650+++ acceptance/tests/emails/email_verification.py 2013-05-02 18:17:26 +0000
651@@ -10,7 +10,7 @@
652 )
653 from u1testutils.sst import config
654
655-from identityprovider.tests.acceptance.shared import helpers, urls
656+from acceptance import helpers, urls
657
658
659 config.set_base_url_from_env()
660
661=== modified file 'acceptance/tests/emails/invalidate_link.py'
662--- identityprovider/tests/acceptance/emails/invalidate_link.py 2013-04-12 17:01:33 +0000
663+++ acceptance/tests/emails/invalidate_link.py 2013-05-02 18:17:26 +0000
664@@ -14,7 +14,7 @@
665 from u1testutils.sst import config
666
667 from identityprovider.tests import DEFAULT_USER_PASSWORD
668-from identityprovider.tests.acceptance.shared import helpers, urls
669+from acceptance import helpers, urls
670
671
672 check_flags('allow_unverified')
673
674=== modified file 'acceptance/tests/emails/login_deleted.py'
675--- identityprovider/tests/acceptance/emails/login_deleted.py 2013-02-04 17:07:22 +0000
676+++ acceptance/tests/emails/login_deleted.py 2013-05-02 18:17:26 +0000
677@@ -13,7 +13,7 @@
678 from u1testutils import mail
679 from u1testutils.sst import config
680
681-from identityprovider.tests.acceptance.shared import helpers
682+from acceptance import helpers
683
684
685 config.set_base_url_from_env()
686
687=== modified file 'acceptance/tests/emails/login_secondary.py'
688--- identityprovider/tests/acceptance/emails/login_secondary.py 2013-03-06 16:47:06 +0000
689+++ acceptance/tests/emails/login_secondary.py 2013-05-02 18:17:26 +0000
690@@ -14,7 +14,7 @@
691 from u1testutils import mail
692 from u1testutils.sst import config
693
694-from identityprovider.tests.acceptance.shared import helpers
695+from acceptance import helpers
696
697
698 config.set_base_url_from_env()
699
700=== modified file 'acceptance/tests/emails/resend_verification.py'
701--- identityprovider/tests/acceptance/emails/resend_verification.py 2013-04-12 17:01:33 +0000
702+++ acceptance/tests/emails/resend_verification.py 2013-05-02 18:17:26 +0000
703@@ -1,4 +1,4 @@
704-from identityprovider.tests.acceptance.shared import helpers, urls
705+from acceptance import helpers, urls
706
707 from sst import actions
708 from u1testutils import mail
709
710=== modified file 'acceptance/tests/emails/used_email.py'
711--- identityprovider/tests/acceptance/emails/used_email.py 2013-01-30 18:16:50 +0000
712+++ acceptance/tests/emails/used_email.py 2013-05-02 18:17:26 +0000
713@@ -4,7 +4,7 @@
714 from u1testutils import mail
715 from u1testutils.sst import config
716
717-from identityprovider.tests.acceptance.shared import helpers
718+from acceptance import helpers
719
720
721 config.set_base_url_from_env()
722
723=== modified file 'acceptance/tests/emails/valid_address.py'
724--- identityprovider/tests/acceptance/emails/valid_address.py 2013-01-30 18:16:50 +0000
725+++ acceptance/tests/emails/valid_address.py 2013-05-02 18:17:26 +0000
726@@ -14,7 +14,7 @@
727 from u1testutils import mail
728 from u1testutils.sst import config
729
730-from identityprovider.tests.acceptance.shared import helpers, urls
731+from acceptance import helpers, urls
732
733
734 config.set_base_url_from_env()
735
736=== renamed directory 'identityprovider/tests/acceptance/forgot_password' => 'acceptance/tests/forgot_password'
737=== modified file 'acceptance/tests/forgot_password/forgot_password_1_manual_token.py'
738--- identityprovider/tests/acceptance/forgot_password/forgot_password_1_manual_token.py 2013-04-12 17:01:33 +0000
739+++ acceptance/tests/forgot_password/forgot_password_1_manual_token.py 2013-05-02 18:17:26 +0000
740@@ -12,7 +12,7 @@
741 from u1testutils.sso import mail
742 from u1testutils.sst import config
743
744-from identityprovider.tests.acceptance.shared import helpers, urls
745+from acceptance import helpers, urls
746
747
748 config.set_base_url_from_env()
749
750=== modified file 'acceptance/tests/forgot_password/forgot_password_2_email_link.py'
751--- identityprovider/tests/acceptance/forgot_password/forgot_password_2_email_link.py 2013-04-12 17:01:33 +0000
752+++ acceptance/tests/forgot_password/forgot_password_2_email_link.py 2013-05-02 18:17:26 +0000
753@@ -13,7 +13,7 @@
754 from u1testutils.sso import mail
755 from u1testutils.sst import config
756
757-from identityprovider.tests.acceptance.shared import helpers, urls
758+from acceptance import helpers, urls
759
760
761 config.set_base_url_from_env()
762
763=== modified file 'acceptance/tests/forgot_password/forgot_password_3_token_reuse.py'
764--- identityprovider/tests/acceptance/forgot_password/forgot_password_3_token_reuse.py 2013-04-12 17:01:33 +0000
765+++ acceptance/tests/forgot_password/forgot_password_3_token_reuse.py 2013-05-02 18:17:26 +0000
766@@ -11,7 +11,7 @@
767 from u1testutils.sso import mail
768 from u1testutils.sst import config
769
770-from identityprovider.tests.acceptance.shared import helpers
771+from acceptance import helpers
772
773 config.set_base_url_from_env()
774
775
776=== renamed directory 'identityprovider/tests/acceptance/logout' => 'acceptance/tests/logout'
777=== modified file 'acceptance/tests/logout/launchpad_logout.py'
778--- identityprovider/tests/acceptance/logout/launchpad_logout.py 2013-02-22 20:03:33 +0000
779+++ acceptance/tests/logout/launchpad_logout.py 2013-05-02 18:17:26 +0000
780@@ -11,7 +11,7 @@
781 )
782 from u1testutils.sst import config
783
784-from identityprovider.tests.acceptance.shared import helpers, urls
785+from acceptance import helpers, urls
786
787
788 # Set to Production, Staging, VPS, Developer etc..
789
790=== modified file 'acceptance/tests/logout/logout_deep_pages.py'
791--- identityprovider/tests/acceptance/logout/logout_deep_pages.py 2013-02-22 20:03:33 +0000
792+++ acceptance/tests/logout/logout_deep_pages.py 2013-05-02 18:17:26 +0000
793@@ -10,8 +10,8 @@
794 )
795 from u1testutils.sst import config
796
797-from identityprovider.tests.acceptance.shared import helpers, urls
798-from identityprovider.tests.acceptance.shared.devices import (
799+from acceptance import helpers, urls
800+from acceptance.devices import (
801 add_device,
802 authenticate,
803 click_delete_button,
804
805=== modified file 'acceptance/tests/logout/logout_launchpad.py'
806--- identityprovider/tests/acceptance/logout/logout_launchpad.py 2013-04-22 20:35:58 +0000
807+++ acceptance/tests/logout/logout_launchpad.py 2013-05-02 18:17:26 +0000
808@@ -13,7 +13,7 @@
809 )
810 from u1testutils.sst import config
811
812-from identityprovider.tests.acceptance.shared import helpers, urls
813+from acceptance import helpers, urls
814
815
816 # Set to Production, Staging, VPS, Developer etc..
817
818=== modified file 'acceptance/tests/logout/logout_ubuntu.py'
819--- identityprovider/tests/acceptance/logout/logout_ubuntu.py 2013-04-22 20:35:58 +0000
820+++ acceptance/tests/logout/logout_ubuntu.py 2013-05-02 18:17:26 +0000
821@@ -12,7 +12,7 @@
822 )
823 from u1testutils.sst import config
824
825-from identityprovider.tests.acceptance.shared import urls
826+from acceptance import urls
827
828
829 # Set to Production, Staging, VPS, Developer etc..
830
831=== renamed directory 'identityprovider/tests/acceptance/new_account' => 'acceptance/tests/new_account'
832=== modified file 'acceptance/tests/new_account/check_captcha.py'
833--- identityprovider/tests/acceptance/new_account/check_captcha.py 2013-02-07 13:40:08 +0000
834+++ acceptance/tests/new_account/check_captcha.py 2013-05-02 18:17:26 +0000
835@@ -12,7 +12,7 @@
836 )
837 from u1testutils.sst import config
838
839-from identityprovider.tests.acceptance.shared import helpers, urls
840+from acceptance import helpers, urls
841
842 if not exists_element(id='recaptcha_response_field'):
843 skip("Test skipped - no captcha present")
844
845=== modified file 'acceptance/tests/new_account/emails_invalid.py'
846--- identityprovider/tests/acceptance/new_account/emails_invalid.py 2013-04-22 20:35:58 +0000
847+++ acceptance/tests/new_account/emails_invalid.py 2013-05-02 18:17:26 +0000
848@@ -9,7 +9,7 @@
849 )
850 from u1testutils.sst import config
851
852-from identityprovider.tests.acceptance.shared import helpers, urls
853+from acceptance import helpers, urls
854
855
856 # Set to Production, Staging, VPS, Developer etc..
857
858=== modified file 'acceptance/tests/new_account/new_account_1_manual_token.py'
859--- identityprovider/tests/acceptance/new_account/new_account_1_manual_token.py 2013-04-12 17:01:33 +0000
860+++ acceptance/tests/new_account/new_account_1_manual_token.py 2013-05-02 18:17:26 +0000
861@@ -15,7 +15,7 @@
862 from u1testutils.sso import mail as sso_mail
863 from u1testutils.sst import config
864
865-from identityprovider.tests.acceptance.shared import urls, helpers
866+from acceptance import helpers, urls
867
868
869 config.set_base_url_from_env()
870
871=== modified file 'acceptance/tests/new_account/new_account_2_email_link.py'
872--- identityprovider/tests/acceptance/new_account/new_account_2_email_link.py 2013-04-12 17:01:33 +0000
873+++ acceptance/tests/new_account/new_account_2_email_link.py 2013-05-02 18:17:26 +0000
874@@ -12,7 +12,7 @@
875 from u1testutils.sso import mail as sso_mail
876 from u1testutils.sst import config
877
878-from identityprovider.tests.acceptance.shared import urls, helpers
879+from acceptance import helpers, urls
880
881
882 config.set_base_url_from_env()
883
884=== modified file 'acceptance/tests/new_account/new_account_3_duplicate_email.py'
885--- identityprovider/tests/acceptance/new_account/new_account_3_duplicate_email.py 2013-03-06 16:47:06 +0000
886+++ acceptance/tests/new_account/new_account_3_duplicate_email.py 2013-05-02 18:17:26 +0000
887@@ -8,7 +8,7 @@
888 from u1testutils import mail
889 from u1testutils.sst import config
890
891-from identityprovider.tests.acceptance.shared import helpers, urls
892+from acceptance import helpers, urls
893
894
895 config.set_base_url_from_env()
896
897=== modified file 'acceptance/tests/new_account/new_account_4_token_reuse.py'
898--- identityprovider/tests/acceptance/new_account/new_account_4_token_reuse.py 2013-03-06 16:47:06 +0000
899+++ acceptance/tests/new_account/new_account_4_token_reuse.py 2013-05-02 18:17:26 +0000
900@@ -14,7 +14,7 @@
901 from u1testutils import mail
902 from u1testutils.sst import config
903
904-from identityprovider.tests.acceptance.shared import helpers
905+from acceptance import helpers
906
907 if 'allow_unverified' in sst_config.flags:
908 skip("allow_unverified means this test is irrelevant")
909
910=== modified file 'acceptance/tests/new_account/new_account_5_not_when_logged_in.py'
911--- identityprovider/tests/acceptance/new_account/new_account_5_not_when_logged_in.py 2013-01-24 17:02:52 +0000
912+++ acceptance/tests/new_account/new_account_5_not_when_logged_in.py 2013-05-02 18:17:26 +0000
913@@ -6,7 +6,7 @@
914 )
915 from u1testutils.sst import config
916
917-from identityprovider.tests.acceptance.shared import helpers, urls
918+from acceptance import helpers, urls
919
920
921 config.set_base_url_from_env()
922
923=== modified file 'acceptance/tests/new_account/new_account_6_required_fields.py'
924--- identityprovider/tests/acceptance/new_account/new_account_6_required_fields.py 2013-03-22 15:18:29 +0000
925+++ acceptance/tests/new_account/new_account_6_required_fields.py 2013-05-02 18:17:26 +0000
926@@ -9,7 +9,7 @@
927 from u1testutils import mail
928 from u1testutils.sst import config
929
930-from identityprovider.tests.acceptance.shared import helpers, urls
931+from acceptance import helpers, urls
932
933
934 config.set_base_url_from_env()
935
936=== modified file 'acceptance/tests/new_account/new_account_7_invalid_token.py'
937--- identityprovider/tests/acceptance/new_account/new_account_7_invalid_token.py 2013-04-12 17:01:33 +0000
938+++ acceptance/tests/new_account/new_account_7_invalid_token.py 2013-05-02 18:17:26 +0000
939@@ -17,7 +17,7 @@
940 from u1testutils.sso import mail as sso_mail
941 from u1testutils.sst import config
942
943-from identityprovider.tests.acceptance.shared import urls, helpers
944+from acceptance import helpers, urls
945
946
947 if 'allow_unverified' in sst_config.flags:
948
949=== modified file 'acceptance/tests/new_account/new_account_8_confirmation_requires_login.py'
950--- identityprovider/tests/acceptance/new_account/new_account_8_confirmation_requires_login.py 2013-04-12 17:09:59 +0000
951+++ acceptance/tests/new_account/new_account_8_confirmation_requires_login.py 2013-05-02 18:17:26 +0000
952@@ -11,7 +11,7 @@
953 from u1testutils.sso import mail as sso_mail
954 from u1testutils.sst import config
955
956-from identityprovider.tests.acceptance.shared import helpers
957+from acceptance import helpers
958
959
960 check_flags('allow_unverified')
961
962=== modified file 'acceptance/tests/new_account/passwords_bad_client-side.py'
963--- identityprovider/tests/acceptance/new_account/passwords_bad_client-side.py 2013-03-22 15:18:29 +0000
964+++ acceptance/tests/new_account/passwords_bad_client-side.py 2013-05-02 18:17:26 +0000
965@@ -14,7 +14,7 @@
966 )
967 from u1testutils.sst import config
968
969-from identityprovider.tests.acceptance.shared import urls
970+from acceptance import urls
971
972
973 config.set_base_url_from_env()
974
975=== modified file 'acceptance/tests/new_account/passwords_bad_server-side.py'
976--- identityprovider/tests/acceptance/new_account/passwords_bad_server-side.py 2013-03-22 15:18:29 +0000
977+++ acceptance/tests/new_account/passwords_bad_server-side.py 2013-05-02 18:17:26 +0000
978@@ -15,7 +15,7 @@
979 from u1testutils import mail
980 from u1testutils.sst import config
981
982-from identityprovider.tests.acceptance.shared import helpers, urls
983+from acceptance import helpers, urls
984
985
986 EMAIL = mail.make_unique_test_email_address()
987
988=== modified file 'acceptance/tests/new_account/passwords_valid.py'
989--- identityprovider/tests/acceptance/new_account/passwords_valid.py 2013-04-12 17:01:33 +0000
990+++ acceptance/tests/new_account/passwords_valid.py 2013-05-02 18:17:26 +0000
991@@ -17,7 +17,7 @@
992 from u1testutils.sso import mail as sso_mail
993 from u1testutils.sst import config
994
995-from identityprovider.tests.acceptance.shared import urls, helpers
996+from acceptance import helpers, urls
997
998
999 email_address = mail.make_unique_test_email_address()
1000
1001=== modified file 'acceptance/tests/new_account/personless_account.py'
1002--- identityprovider/tests/acceptance/new_account/personless_account.py 2013-04-16 16:53:06 +0000
1003+++ acceptance/tests/new_account/personless_account.py 2013-05-02 18:17:26 +0000
1004@@ -28,7 +28,7 @@
1005 from u1testutils import mail
1006 from u1testutils.sst import config
1007
1008-from identityprovider.tests.acceptance.shared import helpers, urls
1009+from acceptance import helpers, urls
1010
1011
1012 config.set_base_url_from_env()
1013
1014=== renamed file 'identityprovider/tests/acceptance/production_only_smoke_test.py' => 'acceptance/tests/production_only_smoke_test.py'
1015--- identityprovider/tests/acceptance/production_only_smoke_test.py 2013-04-22 20:35:58 +0000
1016+++ acceptance/tests/production_only_smoke_test.py 2013-05-02 18:17:26 +0000
1017@@ -20,7 +20,7 @@
1018 )
1019 from u1testutils.sst import config
1020
1021-from helpers import logout, production_only
1022+from acceptance.helpers import logout, production_only
1023
1024 config.set_base_url_from_env()
1025
1026
1027=== renamed directory 'identityprovider/tests/acceptance/root' => 'acceptance/tests/root'
1028=== modified file 'acceptance/tests/root/link_logo.py'
1029--- identityprovider/tests/acceptance/root/link_logo.py 2013-03-22 15:18:29 +0000
1030+++ acceptance/tests/root/link_logo.py 2013-05-02 18:17:26 +0000
1031@@ -13,7 +13,7 @@
1032 )
1033 from u1testutils.sst import config
1034
1035-from identityprovider.tests.acceptance.shared import urls
1036+from acceptance import urls
1037
1038 config.set_base_url_from_env()
1039
1040
1041=== modified file 'acceptance/tests/root/links.py'
1042--- identityprovider/tests/acceptance/root/links.py 2013-01-25 13:01:47 +0000
1043+++ acceptance/tests/root/links.py 2013-05-02 18:17:26 +0000
1044@@ -13,7 +13,7 @@
1045 )
1046 from u1testutils.sst import config
1047
1048-from identityprovider.tests.acceptance.shared import urls
1049+from acceptance import urls
1050
1051
1052 config.set_base_url_from_env()
1053
1054=== modified file 'acceptance/tests/root/login_requireds.py'
1055--- identityprovider/tests/acceptance/root/login_requireds.py 2013-03-22 15:18:29 +0000
1056+++ acceptance/tests/root/login_requireds.py 2013-05-02 18:17:26 +0000
1057@@ -10,7 +10,7 @@
1058 )
1059 from u1testutils.sst import config
1060
1061-from identityprovider.tests.acceptance.shared import urls
1062+from acceptance import urls
1063
1064
1065 config.set_base_url_from_env()
1066
1067=== modified file 'acceptance/tests/root/login_wrong_password.py'
1068--- identityprovider/tests/acceptance/root/login_wrong_password.py 2013-01-30 18:16:50 +0000
1069+++ acceptance/tests/root/login_wrong_password.py 2013-05-02 18:17:26 +0000
1070@@ -11,7 +11,7 @@
1071 from u1testutils import mail
1072 from u1testutils.sst import config
1073
1074-from identityprovider.tests.acceptance.shared import helpers
1075+from acceptance import helpers
1076
1077
1078 config.set_base_url_from_env()
1079
1080=== renamed directory 'identityprovider/tests/acceptance/two_factor' => 'acceptance/tests/two_factor'
1081=== modified file 'acceptance/tests/two_factor/check_username_display.py'
1082--- identityprovider/tests/acceptance/two_factor/check_username_display.py 2013-01-24 17:02:52 +0000
1083+++ acceptance/tests/two_factor/check_username_display.py 2013-05-02 18:17:26 +0000
1084@@ -2,9 +2,9 @@
1085
1086 from u1testutils.sst import config
1087
1088-from identityprovider.tests.acceptance.shared import helpers
1089+from acceptance import helpers
1090
1091-from actions import (
1092+from acceptance.actions import (
1093 subheader,
1094 two_factor,
1095 )
1096
1097=== renamed file 'identityprovider/tests/acceptance/views_protected.py' => 'acceptance/tests/views_protected.py'
1098--- identityprovider/tests/acceptance/views_protected.py 2013-01-24 17:02:52 +0000
1099+++ acceptance/tests/views_protected.py 2013-05-02 18:17:26 +0000
1100@@ -1,7 +1,7 @@
1101 from u1testutils.sst import config
1102
1103-from identityprovider.tests.acceptance.shared import helpers, urls
1104-from identityprovider.tests.acceptance.shared.devices import (
1105+from acceptance import helpers, urls
1106+from acceptance.devices import (
1107 add_device,
1108 authenticate,
1109 )
1110
1111=== renamed file 'identityprovider/tests/acceptance/shared/urls.py' => 'acceptance/urls.py'
1112=== modified file 'fabtasks/development.py'
1113--- fabtasks/development.py 2013-03-20 15:57:50 +0000
1114+++ fabtasks/development.py 2013-05-02 18:17:26 +0000
1115@@ -64,7 +64,7 @@
1116 quiet = _is_true(quiet, 'quiet')
1117 screenshot = _is_true(screenshot, 'screenshot')
1118 failfast = _is_true(failfast, 'failfast')
1119- directory = '-d identityprovider/tests/acceptance/%s' % tests
1120+ directory = '-d acceptance/%s' % tests
1121 debug = _is_true(debug, 'debug')
1122
1123 cmd = ['DJANGO_SETTINGS_MODULE=django_project.settings PYTHONPATH=.:lib',
1124
1125=== removed directory 'identityprovider/tests/acceptance/shared'
1126=== removed file 'identityprovider/tests/acceptance/shared/__init__.py'
1127=== modified file 'tools/pyflakes.txt'
1128--- tools/pyflakes.txt 2013-02-13 21:51:19 +0000
1129+++ tools/pyflakes.txt 2013-05-02 18:17:26 +0000
1130@@ -9,48 +9,48 @@
1131 identityprovider/models/__init__.py: 'from team import *' used; unable to detect undefined names
1132 identityprovider/models/__init__.py: 'from api import *' used; unable to detect undefined names
1133 identityprovider/models/__init__.py: 'from twofactor import *' used; unable to detect undefined names
1134-identityprovider/tests/acceptance/new_account/passwords_bad_server-side.py: undefined name 'password'
1135-identityprovider/tests/acceptance/new_account/passwords_bad_server-side.py: undefined name 'password'
1136-identityprovider/tests/acceptance/new_account/passwords_bad_client-side.py: undefined name 'password'
1137-identityprovider/tests/acceptance/new_account/passwords_bad_client-side.py: undefined name 'error'
1138-identityprovider/tests/acceptance/new_account/passwords_valid.py: undefined name 'password'
1139-identityprovider/tests/acceptance/new_account/passwords_valid.py: undefined name 'password'
1140-identityprovider/tests/acceptance/new_account/emails_invalid.py: undefined name 'invalid_email'
1141-identityprovider/tests/acceptance/consumer/SREG_opt_out.py: undefined name 'toggled_elements'
1142-identityprovider/tests/acceptance/consumer/SREG_opt_out.py: undefined name 'disabled_elements'
1143-identityprovider/tests/acceptance/consumer/SREG_opt_out.py: undefined name 'returned_sreg'
1144-identityprovider/tests/acceptance/consumer/SREG_opt_out.py: undefined name 'radio_nickname'
1145-identityprovider/tests/acceptance/consumer/SREG_opt_out.py: undefined name 'radio_fullname'
1146-identityprovider/tests/acceptance/consumer/SREG_opt_out.py: undefined name 'radio_email'
1147-identityprovider/tests/acceptance/consumer/SREG_opt_out.py: undefined name 'radio_language'
1148-identityprovider/tests/acceptance/consumer/return_private_teams.py: undefined name 'resulting_teams'
1149-identityprovider/tests/acceptance/consumer/return_private_teams.py: undefined name 'team_names'
1150-identityprovider/tests/acceptance/emails/email_verification.py: undefined name 'address'
1151-identityprovider/tests/acceptance/emails/email_verification.py: undefined name 'code'
1152-identityprovider/tests/acceptance/emails/email_verification.py: undefined name 'error1'
1153-identityprovider/tests/acceptance/emails/email_verification.py: undefined name 'error2'
1154-identityprovider/tests/acceptance/emails/valid_address.py: undefined name 'address'
1155-identityprovider/tests/acceptance/emails/valid_address.py: undefined name 'valid'
1156-identityprovider/tests/acceptance/emails/valid_address.py: undefined name 'address'
1157-identityprovider/tests/acceptance/edit/change_password_bad.py: undefined name 'new_password'
1158-identityprovider/tests/acceptance/edit/change_password_bad.py: undefined name 'new_password'
1159-identityprovider/tests/acceptance/edit/valid_change_password.py: undefined name 'new_password'
1160-identityprovider/tests/acceptance/edit/valid_change_password.py: undefined name 'new_password'
1161-identityprovider/tests/acceptance/edit/valid_change_password.py: undefined name 'new_password'
1162-identityprovider/tests/acceptance/edit/illegitimate_passwords.py: undefined name 'password'
1163-identityprovider/tests/acceptance/edit/illegitimate_passwords.py: undefined name 'passwordconfirm'
1164-identityprovider/tests/acceptance/edit/illegitimate_passwords.py: undefined name 'password'
1165-identityprovider/tests/acceptance/edit/illegitimate_passwords.py: undefined name 'passwordconfirm'
1166-identityprovider/tests/acceptance/edit/illegitimate_passwords.py: undefined name 'error'
1167-identityprovider/tests/acceptance/edit/illegitimate_passwords.py: undefined name 'error'
1168-identityprovider/tests/acceptance/edit/illegitimate_passwords.py: undefined name 'error'
1169-identityprovider/tests/acceptance/edit/illegitimate_passwords.py: undefined name 'error'
1170-identityprovider/tests/acceptance/root/links.py: undefined name 'link_text'
1171-identityprovider/tests/acceptance/root/links.py: undefined name 'title'
1172-identityprovider/tests/acceptance/root/login_requireds.py: undefined name 'email'
1173-identityprovider/tests/acceptance/root/login_requireds.py: undefined name 'password'
1174-identityprovider/tests/acceptance/root/login_requireds.py: undefined name 'errors'
1175-identityprovider/tests/acceptance: unable to detect undefined names
1176+acceptance/tests/new_account/passwords_bad_server-side.py: undefined name 'password'
1177+acceptance/tests/new_account/passwords_bad_server-side.py: undefined name 'password'
1178+acceptance/tests/new_account/passwords_bad_client-side.py: undefined name 'password'
1179+acceptance/tests/new_account/passwords_bad_client-side.py: undefined name 'error'
1180+acceptance/tests/new_account/passwords_valid.py: undefined name 'password'
1181+acceptance/tests/new_account/passwords_valid.py: undefined name 'password'
1182+acceptance/tests/new_account/emails_invalid.py: undefined name 'invalid_email'
1183+acceptance/tests/consumer/SREG_opt_out.py: undefined name 'toggled_elements'
1184+acceptance/tests/consumer/SREG_opt_out.py: undefined name 'disabled_elements'
1185+acceptance/tests/consumer/SREG_opt_out.py: undefined name 'returned_sreg'
1186+acceptance/tests/consumer/SREG_opt_out.py: undefined name 'radio_nickname'
1187+acceptance/tests/consumer/SREG_opt_out.py: undefined name 'radio_fullname'
1188+acceptance/tests/consumer/SREG_opt_out.py: undefined name 'radio_email'
1189+acceptance/tests/consumer/SREG_opt_out.py: undefined name 'radio_language'
1190+acceptance/tests/consumer/return_private_teams.py: undefined name 'resulting_teams'
1191+acceptance/tests/consumer/return_private_teams.py: undefined name 'team_names'
1192+acceptance/tests/emails/email_verification.py: undefined name 'address'
1193+acceptance/tests/emails/email_verification.py: undefined name 'code'
1194+acceptance/tests/emails/email_verification.py: undefined name 'error1'
1195+acceptance/tests/emails/email_verification.py: undefined name 'error2'
1196+acceptance/tests/emails/valid_address.py: undefined name 'address'
1197+acceptance/tests/emails/valid_address.py: undefined name 'valid'
1198+acceptance/tests/emails/valid_address.py: undefined name 'address'
1199+acceptance/tests/edit/change_password_bad.py: undefined name 'new_password'
1200+acceptance/tests/edit/change_password_bad.py: undefined name 'new_password'
1201+acceptance/tests/edit/valid_change_password.py: undefined name 'new_password'
1202+acceptance/tests/edit/valid_change_password.py: undefined name 'new_password'
1203+acceptance/tests/edit/valid_change_password.py: undefined name 'new_password'
1204+acceptance/tests/edit/illegitimate_passwords.py: undefined name 'password'
1205+acceptance/tests/edit/illegitimate_passwords.py: undefined name 'passwordconfirm'
1206+acceptance/tests/edit/illegitimate_passwords.py: undefined name 'password'
1207+acceptance/tests/edit/illegitimate_passwords.py: undefined name 'passwordconfirm'
1208+acceptance/tests/edit/illegitimate_passwords.py: undefined name 'error'
1209+acceptance/tests/edit/illegitimate_passwords.py: undefined name 'error'
1210+acceptance/tests/edit/illegitimate_passwords.py: undefined name 'error'
1211+acceptance/tests/edit/illegitimate_passwords.py: undefined name 'error'
1212+acceptance/tests/root/links.py: undefined name 'link_text'
1213+acceptance/tests/root/links.py: undefined name 'title'
1214+acceptance/tests/root/login_requireds.py: undefined name 'email'
1215+acceptance/tests/root/login_requireds.py: undefined name 'password'
1216+acceptance/tests/root/login_requireds.py: undefined name 'errors'
1217+acceptance/tests: unable to detect undefined names
1218 webui/migrations/:
1219 webui/urls.py: 'from django.conf.urls.defaults import *' used; unable to detect undefined names
1220 api/migrations: