Merge lp:~diegosarmentero/ubuntu-sso-client/931577 into lp:ubuntu-sso-client

Proposed by Diego Sarmentero on 2012-02-13
Status: Merged
Approved by: Natalia Bidart on 2012-02-14
Approved revision: 868
Merged at revision: 873
Proposed branch: lp:~diegosarmentero/ubuntu-sso-client/931577
Merge into: lp:ubuntu-sso-client
Diff against target: 38 lines (+3/-3)
3 files modified
ubuntu_sso/qt/forgotten_password_page.py (+1/-1)
ubuntu_sso/qt/tests/test_forgotten_password.py (+1/-1)
ubuntu_sso/qt/ubuntu_sso_wizard.py (+1/-1)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntu-sso-client/931577
Reviewer Review Type Date Requested Status
Natalia Bidart Approve on 2012-02-14
Brian Curtin (community) 2012-02-13 Approve on 2012-02-14
Review via email: mp+92863@code.launchpad.net

Commit message

- Fixed: Qt UI: after clicking on "I've forgotten my password", and entering an email, nothing happens (LP: #931577).

To post a comment you must log in.
Brian Curtin (brian.curtin) wrote :

+1

review: Approve
Natalia Bidart (nataliabidart) wrote :

Looks and works great!

review: Approve
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (63.9 KiB)

The attempt to merge lp:~diegosarmentero/ubuntu-sso-client/931577 into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
ubuntu_sso.tests.test_account
  AccountTestCase
    test_generate_captcha ... [OK]
    test_is_not_validated ... [OK]
    test_is_not_validated_empty_result ... [OK]
    test_is_validated ... [OK]
    test_login_if_http_error ... [OK]
    test_login_if_no_error ... [OK]
    test_register_user_checks_valid_email ... [OK]
    test_register_user_checks_valid_password ... [OK]
    test_register_user_if_status_error ... [OK]
    test_register_user_if_status_error_with_string_message ... [OK]
    test_register_user_if_status_ok ... [OK]
    test_register_user_if_status_unknown ... [OK]
    test_request_password_reset_token_if_http_error ... [OK]
    test_request_password_reset_token_if_status_ok ... [OK]
    test_request_password_reset_token_if_status_unknown ... [OK]
    test_set_new_password_if_http_error ... [OK]
    test_set_new_password_if_status_ok ... [OK]
    test_set_new_password_if_status_unknown ... [OK]
    test_validate_email_if_status_error ... [OK]
    test_validate_email_if_status_error_with_string_message ... [OK]
    test_validate_email_if_status_ok ... [OK]
    test_validate_email_if_status_unknown ... [OK]
  EnvironOverridesTestCase
    test_no_override_service_url ... [OK]
    test_override_service_url ... [OK]
    test_service_url_as_parameter ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.tests.test_account
  TimestampedAuthorizerTestCase
    test_authorize_request_includes_timestamp ... [OK]
ubuntu_sso.tests.test_credentials
  BasicTestCase
    runTest ... [OK]
  ClearCredentialsTestCase
    test_clear_credentials ... [OK]
    test_keyring_failure ... [OK]
  CredentialsCallbacksTestCase
    test_creation_parameters_are_stored ... [OK]
    test_help_text_defaults_to_empty_string ... [OK]
    test_ping_url_defaults_to_none ... [OK]
    test_policy_url_defaults_to_none ... [OK]
    test_tc...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/qt/forgotten_password_page.py'
2--- ubuntu_sso/qt/forgotten_password_page.py 2012-02-10 21:09:38 +0000
3+++ ubuntu_sso/qt/forgotten_password_page.py 2012-02-13 22:00:25 +0000
4@@ -160,7 +160,7 @@
5 self.email_widget.setVisible(True)
6
7 # pylint: disable=W0212
8- def on_password_reset_token_sent(self):
9+ def on_password_reset_token_sent(self, app_name, result):
10 """Action taken when we managed to get the password reset done."""
11 # ignore the result and move to the reset page
12 self.passwordResetTokenSent.emit()
13
14=== modified file 'ubuntu_sso/qt/tests/test_forgotten_password.py'
15--- ubuntu_sso/qt/tests/test_forgotten_password.py 2012-02-10 21:09:38 +0000
16+++ ubuntu_sso/qt/tests/test_forgotten_password.py 2012-02-13 22:00:25 +0000
17@@ -210,7 +210,7 @@
18 """Fake slot."""
19 self.signals_results.append(1)
20 self.ui.passwordResetTokenSent.connect(slot)
21- self.ui.on_password_reset_token_sent()
22+ self.ui.on_password_reset_token_sent('app_name', {})
23 self.assertTrue(1 in self.signals_results)
24
25 def test_on_password_reset_error(self):
26
27=== modified file 'ubuntu_sso/qt/ubuntu_sso_wizard.py'
28--- ubuntu_sso/qt/ubuntu_sso_wizard.py 2012-02-13 21:32:04 +0000
29+++ ubuntu_sso/qt/ubuntu_sso_wizard.py 2012-02-13 22:00:25 +0000
30@@ -125,7 +125,7 @@
31 app_name=self.app_name,
32 parent=self)
33 self.forgotten.passwordResetTokenSent.connect(
34- self._move_to_forgotten_page)
35+ self._move_to_reset_password_page)
36
37 self.reset_password = ResetPasswordPage(Ui_ResetPasswordPage(),
38 app_name=self.app_name,

Subscribers

People subscribed via source and target branches