Merge lp:~diegosarmentero/ubuntu-sso-client/remove-network-detect into lp:ubuntu-sso-client

Proposed by Diego Sarmentero
Status: Merged
Approved by: Diego Sarmentero
Approved revision: 828
Merged at revision: 828
Proposed branch: lp:~diegosarmentero/ubuntu-sso-client/remove-network-detect
Merge into: lp:ubuntu-sso-client
Diff against target: 42 lines (+2/-7)
2 files modified
ubuntu_sso/qt/controllers.py (+2/-2)
ubuntu_sso/qt/tests/test_controllers.py (+0/-5)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntu-sso-client/remove-network-detect
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve
Natalia Bidart (community) Approve
Review via email: mp+87795@code.launchpad.net

Commit message

Remove network detect from sso.

Description of the change

Remove network detect from sso.

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks good!

review: Approve
Revision history for this message
Manuel de la Peña (mandel) wrote :

Looks correct!

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/controllers.py'
2--- ubuntu_sso/qt/controllers.py 2012-01-04 16:02:05 +0000
3+++ ubuntu_sso/qt/controllers.py 2012-01-06 18:35:26 +0000
4@@ -164,13 +164,13 @@
5 """Set the next id and fire signal."""
6 logger.debug('ChooseSignInController._set_next_existing')
7 self.view.next = self.view.wizard().current_user_page_id
8- self.view.check_connection()
9+ self.view.wizard().next()
10
11 def _set_next_new(self):
12 """Set the next id and fire signal."""
13 logger.debug('ChooseSignInController._set_next_new')
14 self.view.next = self.view.wizard().setup_account_page_id
15- self.view.check_connection()
16+ self.view.wizard().next()
17
18
19 class CurrentUserController(BackendController):
20
21=== modified file 'ubuntu_sso/qt/tests/test_controllers.py'
22--- ubuntu_sso/qt/tests/test_controllers.py 2012-01-04 16:02:05 +0000
23+++ ubuntu_sso/qt/tests/test_controllers.py 2012-01-06 18:35:26 +0000
24@@ -201,10 +201,6 @@
25 self.existing_account_button = FakeButton()
26 self.setup_account_button = FakeButton()
27
28- def check_connection(self):
29- """Fake Check Connection."""
30- self.properties['check_connection'] = True
31-
32
33 class FakeCurrentUserView(FakeGenericView):
34
35@@ -771,7 +767,6 @@
36 self.controller._set_next_new()
37 self.assertEqual(self.view.next,
38 self.view.fake_wizard.setup_account_page_id)
39- self.assertTrue(self.view.properties.get('check_connection', False))
40
41
42 class CurrentUserControllerTestCase(BaseTestCase):

Subscribers

People subscribed via source and target branches