Merge lp:~nataliabidart/ubuntu-sso-client/captcha-reload-on-error into lp:ubuntu-sso-client

[Natalia Bidart]

* Captcha is reloaded when any registration error occurs (LP: #634593).
* When there is a captcha generation error, a warning message is shown and captcha is reloaded.
* Removing GtkWarning when running tests.

* Verification token entry is now centered.

* Removed the following warning from the test run:

GtkWarning: Attempting to add a widget with type GtkAlignment to a GtkEventBox, but as a GtkBin subclass a GtkEventBox can only contain one widget at a time; it already contains a widget of type GtkAlignment

To test, please run within this branch:

* run the dbus daemon with this command:

killall ubuntu-sso-login; DEBUG=True PYTHONPATH=. ./bin/ubuntu-sso-login

* run the SSO gui by invoking in d-feet the com.ubuntu.sso bus name, /com/ubuntu/sso/credentials object path, CredentialsManagement interface, 'register' method. Parameters to pass are:

'Ubuntu Two', {}

* Try to register with setting a wrong captcha. You'll see the error in the registration page and the captcha will be reloaded. You can also try to use an already registered email and you'll get the error and the captcha will be reloaded as well.

[Alejandro J. Cura (alecu)]

When merging the branch with trunk:
Text conflict in ubuntu_sso/tests/test_gui.py

review: Needs Fixing

[Alejandro J. Cura (alecu)]

Other than the merge problem mentioned above, the branch looks and works fine.
I've found that the best way to test it seems to try to register using an email address that is already registered, so an error will show up on the registration dialog, and the captcha would be reloaded.

[Natalia Bidart (nataliabidart)]

Conflict fixed!

[Alejandro J. Cura (alecu)]

Approved!

review: Approve

[Matt Griffin (mattgriffin)]

Tested and worked :) Approved!

review: Approve

[dobey (dobey)]

Attempt to merge into lp:ubuntu-sso-client failed due to conflicts:

text conflict in ubuntu_sso/tests/test_gui.py

[dobey (dobey)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.