Ubuntu Single Sign On Client

Merge lp:~diegosarmentero/ubuntu-sso-client/not-validated-overlay into lp:ubuntu-sso-client

  1. not-validated-overlay
  2. Merge into trunk
Proposed by Diego Sarmentero on 2012-03-05
Status: Merged
Approved by: Natalia Bidart on 2012-03-05
Approved revision: 897
Merged at revision: 897
Proposed branch: lp:~diegosarmentero/ubuntu-sso-client/not-validated-overlay
Merge into: lp:ubuntu-sso-client
Diff against target: 23 lines (+2/-0)
2 files modified
ubuntu_sso/qt/current_user_sign_in_page.py (+1/-0)
ubuntu_sso/qt/tests/test_current_user_sign_in_page.py (+1/-0)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntu-sso-client/not-validated-overlay
Reviewer Review Type Date Requested Status
Natalia Bidart 2012-03-05 Approve on 2012-03-05
Review via email: mp+95880@code.launchpad.net

Commit Message

- Made on_user_validated also emit stopProcessing so callers can hide any processing
  overlay they are showing (LP: #945094).

To post a comment you must log in.
Natalia Bidart (nataliabidart) wrote :

Looks good!

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

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

*** Running GTK test suite for ubuntu_sso ***
ubuntu_sso.xdg_base_directory.tests.test_common
  TestBaseDirectory
    test_load_config_paths_filter ... [OK]
    test_save_config_path ... [OK]
    test_xdg_cache_home_is_utf8_bytes ... [OK]
    test_xdg_config_dirs_are_bytes ... [OK]
    test_xdg_config_home_is_utf8_bytes ... [OK]
    test_xdg_data_dirs_are_bytes ... [OK]
    test_xdg_data_home_is_utf8_bytes ... [OK]
    test_xdg_home_is_utf8_bytes ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.main.tests.test_clients
  AbstractTestCase
    test_error ... [OK]
    test_success ... [OK]
ubuntuone.devtools.testcases.dbus
  DBusTestCase
    runTest ... [OK]
ubuntu_sso.main.tests.test_clients
  ClearCredentialsTestCase
    test_error ... [OK]
    test_success ... [OK]
  CredentialsManagementProxyTestCase
    test_error ... [OK]
    test_success ... [OK]
  FindCredentialsTestCase
    test_error ... [OK]
    test_find_credentials_sync ... [OK]
    test_find_credentials_sync_error ... [OK]
    test_success ... [OK]
  GenerateCaptchaTestCase
    test_error ... [OK]
    test_success ... [OK]
  LoginEmailPasswordTestCase
    test_error ... [OK]
    test_success ... [OK]
  LoginOnlyTestCase
    test_error ... [OK]
    test_success ... [OK]
  LoginTestCase
    test_error ... [OK]
    test_error_when_setting_credentials ... [OK]
    test_not_validated ... [OK]
    test_success ... [OK]
  RegisterTestCase
    test_error ... [OK]
    test_success ... ...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/qt/current_user_sign_in_page.py'
2--- ubuntu_sso/qt/current_user_sign_in_page.py 2012-03-01 20:46:34 +0000
3+++ ubuntu_sso/qt/current_user_sign_in_page.py 2012-03-05 12:13:18 +0000
4@@ -65,6 +65,7 @@
5
6 def on_user_not_validated(self, *args):
7 """Show the validate email page."""
8+ self.hide_overlay()
9 email = unicode(self.ui.email_edit.text())
10 password = unicode(self.ui.password_edit.text())
11 self.userNotValidated.emit(email, password)
12
13=== modified file 'ubuntu_sso/qt/tests/test_current_user_sign_in_page.py'
14--- ubuntu_sso/qt/tests/test_current_user_sign_in_page.py 2012-03-01 20:46:34 +0000
15+++ ubuntu_sso/qt/tests/test_current_user_sign_in_page.py 2012-03-05 12:13:18 +0000
16@@ -46,6 +46,7 @@
17 self.signals_results.append((email, password))
18 self.ui.userNotValidated.connect(slot)
19 self.ui.on_user_not_validated()
20+ self.assertEqual(self._overlay_hide_counter, 1)
21 self.assertIn((email, password), self.signals_results)
22
23 def test_initialize_page(self):

Subscribers

People subscribed via source and target branches