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

Proposed by Diego Sarmentero on 2012-10-23
Status: Merged
Approved by: Brian Curtin on 2012-10-24
Approved revision: 1008
Merged at revision: 1008
Proposed branch: lp:~diegosarmentero/ubuntu-sso-client/bugtest
Merge into: lp:ubuntu-sso-client
Diff against target: 23 lines (+2/-4)
1 file modified
ubuntu_sso/qt/tests/test_setup_account.py (+2/-4)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntu-sso-client/bugtest
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve on 2012-10-24
Roberto Alsina (community) Approve on 2012-10-24
dobey (community) 2012-10-23 Approve on 2012-10-24
Review via email: mp+131098@code.launchpad.net

Commit Message

- Manual event generation wasn't being processed properly, causing to miss the disconnection (LP: #1070362).

To post a comment you must log in.
dobey (dobey) :
review: Approve
Roberto Alsina (ralsina) :
review: Approve
Brian Curtin (brian.curtin) wrote :

Looks alright, and works on Windows.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/qt/tests/test_setup_account.py'
2--- ubuntu_sso/qt/tests/test_setup_account.py 2012-09-06 15:21:25 +0000
3+++ ubuntu_sso/qt/tests/test_setup_account.py 2012-10-23 20:57:21 +0000
4@@ -272,8 +272,6 @@
5
6 def test_connect_ui_2(self):
7 """Test more connections from connect_ui"""
8-
9- #
10 self.assertEqual(self.ui.ui.captcha_solution_edit.receivers(
11 QtCore.SIGNAL("textEdited(const QString&)")), 1)
12 self.assertEqual(self.ui.terms_checkbox.receivers(
13@@ -378,8 +376,8 @@
14 def test_show_event(self):
15 """Check that show_event works when set_up_button is none."""
16 self.assertEqual(self.ui.set_up_button, None)
17- self.ui.showEvent(QtGui.QShowEvent())
18- self.ui.hideEvent(QtGui.QHideEvent())
19+ self.ui.show()
20+ self.addCleanup(self.ui.hide)
21
22 def test_on_captcha_generated(self):
23 """Check that the captcha image is handled correctly."""

Subscribers

People subscribed via source and target branches