Ubuntu Single Sign On Client

Merge lp:~ralsina/ubuntu-sso-client/pretty-little-liar into lp:ubuntu-sso-client

  1. pretty-little-liar
  2. Merge into trunk
Proposed by Roberto Alsina
Status: Merged
Approved by: Roberto Alsina
Approved revision: 967
Merged at revision: 966
Proposed branch: lp:~ralsina/ubuntu-sso-client/pretty-little-liar
Merge into: lp:ubuntu-sso-client
Diff against target: 53 lines (+3/-7)
4 files modified
ubuntu_sso/qt/current_user_sign_in_page.py (+1/-3)
ubuntu_sso/qt/setup_account_page.py (+0/-1)
ubuntu_sso/qt/tests/test_current_user_sign_in_page.py (+1/-1)
ubuntu_sso/qt/tests/test_setup_account.py (+1/-2)
To merge this branch: bzr merge lp:~ralsina/ubuntu-sso-client/pretty-little-liar
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
dobey (community) Approve
Review via email: mp+109364@code.launchpad.net

Commit message

- Remove back buttons in signin/signup pages (Fixes LP:1009107).

Description of the change

Remove the "Back" button from the two pages that are supposed to be "first".

To test:

1) Ensure you have network conenctivity
2) Remove your device
3) PYTHONPATH=. bin/ubuntu-sso-login-qt --app_name xx
4) PYTHONPATH=. bin/ubuntu-sso-login-qt --app_name xx --login_only

In 3) and 4) you should see the signup/signin pages without a "Back" button.

No tests because Qt doesn't provide a way to know the button layout of a page after it's set, AFAICS.

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Alejandro J. Cura (alecu) wrote :

Tested IRL, works as expected.

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

The attempt to merge lp:~ralsina/ubuntu-sso-client/pretty-little-liar into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
Starting squid version...
Waiting for squid to start....
Waiting for squid to start.....
ubuntu_sso.main.tests.test_common
  BaseTestCase
    runTest ... [OK]
  CredentialsManagementClearTestCase
    test_backend_called ... [OK]
    test_does_not_block ... [OK]
    test_handles_error ... [OK]
  CredentialsManagementFindTestCase
    test_backend_called ... [OK]
    test_does_not_block ... [OK]
    test_find_credentials_with_error_cb ... [OK]
    test_find_credentials_with_success_cb ... [OK]
    test_handles_error ... [OK]
  CredentialsManagementNotFindTestCase
    test_backend_called ... [OK]
    test_does_not_block ... [OK]
    test_find_credentials_with_error_cb ... [OK]
    test_find_credentials_with_success_cb ... [OK]
    test_handles_error ... [OK]
  CredentialsManagementOpsTestCase
    test_login ... [OK]
    test_login_email_password ... [OK]
    test_register ... [OK]
  CredentialsManagementParamsTestCase
    test_login ... [OK]
    test_login_email_password ... [OK]
    test_register ... [OK]
  CredentialsManagementRefCountingTestCase
    test_authorization_denied ... [OK]
    test_autorization_denied_when_ref_count_is_not_positive ... [OK]
    test_clear_credentials ... [OK]
    test_credentials_cleared ... [OK]
    test_credentials_cleared_when_ref_count_is_not_positive ... [OK]
    test_credentials_error ... [OK]
    test_credentials_error_when_ref_count_is_not_positive ... [OK]
    test_credentials_found ... [OK]
    test_credentials_found_when_ref_count_is_not_positive ... [OK]
    test_credentials_not_found ... [OK]
    test_credentials_not_found_when_ref_count_is_not_positive ... [OK]
    test_credentials_stored ... [OK]
    test_credentials_stored_when_ref_count_is_not_positive ... [OK]
...

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

The attempt to merge lp:~ralsina/ubuntu-sso-client/pretty-little-liar into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
Starting squid version...
Waiting for squid to start....
ubuntu_sso.main.tests.test_common
  BaseTestCase
    runTest ... [OK]
  CredentialsManagementClearTestCase
    test_backend_called ... [OK]
    test_does_not_block ... [OK]
    test_handles_error ... [OK]
  CredentialsManagementFindTestCase
    test_backend_called ... [OK]
    test_does_not_block ... [OK]
    test_find_credentials_with_error_cb ... [OK]
    test_find_credentials_with_success_cb ... [OK]
    test_handles_error ... [OK]
  CredentialsManagementNotFindTestCase
    test_backend_called ... [OK]
    test_does_not_block ... [OK]
    test_find_credentials_with_error_cb ... [OK]
    test_find_credentials_with_success_cb ... [OK]
    test_handles_error ... [OK]
  CredentialsManagementOpsTestCase
    test_login ... [OK]
    test_login_email_password ... [OK]
    test_register ... [OK]
  CredentialsManagementParamsTestCase
    test_login ... [OK]
    test_login_email_password ... [OK]
    test_register ... [OK]
  CredentialsManagementRefCountingTestCase
    test_authorization_denied ... [OK]
    test_autorization_denied_when_ref_count_is_not_positive ... [OK]
    test_clear_credentials ... [OK]
    test_credentials_cleared ... [OK]
    test_credentials_cleared_when_ref_count_is_not_positive ... [OK]
    test_credentials_error ... [OK]
    test_credentials_error_when_ref_count_is_not_positive ... [OK]
    test_credentials_found ... [OK]
    test_credentials_found_when_ref_count_is_not_positive ... [OK]
    test_credentials_not_found ... [OK]
    test_credentials_not_found_when_ref_count_is_not_positive ... [OK]
    test_credentials_stored ... [OK]
    test_credentials_stored_when_ref_count_is_not_positive ... [OK]
    test_find_credentials ... ...

lp:~ralsina/ubuntu-sso-client/pretty-little-liar updated
967. By Roberto Alsina

fix tests

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-04-09 17:38:24 +0000
3+++ ubuntu_sso/qt/current_user_sign_in_page.py 2012-06-08 15:13:20 +0000
4@@ -97,9 +97,7 @@
5 self.setButtonText(QtGui.QWizard.CancelButton, CANCEL_BUTTON)
6 # Layout without custom button 1,
7 # without finish button
8- self.wizard().setButtonLayout([
9- QtGui.QWizard.BackButton,
10- QtGui.QWizard.Stretch])
11+ self.wizard().setButtonLayout([])
12
13 # Set sign_in_button as default when the page is shown.
14 self.ui.sign_in_button.setDefault(True)
15
16=== modified file 'ubuntu_sso/qt/setup_account_page.py'
17--- ubuntu_sso/qt/setup_account_page.py 2012-05-01 12:48:42 +0000
18+++ ubuntu_sso/qt/setup_account_page.py 2012-06-08 15:13:20 +0000
19@@ -154,7 +154,6 @@
20
21 # Button setup
22 self.wizard().setButtonLayout([
23- QtGui.QWizard.BackButton,
24 QtGui.QWizard.Stretch,
25 QtGui.QWizard.CustomButton3])
26
27
28=== modified file 'ubuntu_sso/qt/tests/test_current_user_sign_in_page.py'
29--- ubuntu_sso/qt/tests/test_current_user_sign_in_page.py 2012-04-09 17:38:24 +0000
30+++ ubuntu_sso/qt/tests/test_current_user_sign_in_page.py 2012-06-08 15:13:20 +0000
31@@ -59,7 +59,7 @@
32 self.assertEqual(wizard.buttons_text[QtGui.QWizard.CancelButton],
33 "Cancel")
34 self.assertIn(('setButtonLayout',
35- (([QtGui.QWizard.BackButton, QtGui.QWizard.Stretch],), {})),
36+ (([],), {})),
37 wizard.called)
38 self.assertTrue(button.properties['default'])
39 self.assertFalse(button.isEnabled())
40
41=== modified file 'ubuntu_sso/qt/tests/test_setup_account.py'
42--- ubuntu_sso/qt/tests/test_setup_account.py 2012-04-09 17:38:24 +0000
43+++ ubuntu_sso/qt/tests/test_setup_account.py 2012-06-08 15:13:20 +0000
44@@ -207,8 +207,7 @@
45 self.ui.initializePage()
46
47 # set up account button
48- expected = [QtGui.QWizard.BackButton, QtGui.QWizard.Stretch,
49- QtGui.QWizard.CustomButton3]
50+ expected = [QtGui.QWizard.Stretch, QtGui.QWizard.CustomButton3]
51 self.assertIn(('setButtonLayout', ((expected,), {})),
52 self.ui.wizard().called)
53 self.assertEqual(gui.SET_UP_ACCOUNT_BUTTON,

Subscribers

People subscribed via source and target branches