Ubuntu Single Sign On Client

Merge lp:~nataliabidart/ubuntu-sso-client/lint-fix into lp:ubuntu-sso-client

  1. lint-fix
  2. Merge into trunk
Proposed by Natalia Bidart
Status: Merged
Approved by: dobey
Approved revision: 815
Merged at revision: 814
Proposed branch: lp:~nataliabidart/ubuntu-sso-client/lint-fix
Merge into: lp:ubuntu-sso-client
Diff against target: 43 lines (+6/-6)
1 file modified
ubuntu_sso/main/tests/test_linux.py (+6/-6)
To merge this branch: bzr merge lp:~nataliabidart/ubuntu-sso-client/lint-fix
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+82207@code.launchpad.net

Commit message

- Lint fixes (LP: #890349).

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/main/tests/test_linux.py'
2--- ubuntu_sso/main/tests/test_linux.py 2011-11-02 16:56:12 +0000
3+++ ubuntu_sso/main/tests/test_linux.py 2011-11-14 18:41:24 +0000
4@@ -837,7 +837,7 @@
5
6 def test_on_zero_ref_count_shutdown(self):
7 """When ref count reaches 0, queue shutdown op."""
8- self.client.root.timeout_func = self._set_called
9+ self.patch(self.client.root, 'timeout_func', self._set_called)
10 self.client.login(APP_NAME, self.args)
11 self.client.CredentialsFound(APP_NAME, TOKEN)
12
13@@ -846,7 +846,7 @@
14
15 def test_on_non_zero_ref_count_do_not_shutdown(self):
16 """If ref count is not 0, do not queue shutdown op."""
17- self.client.timeout_func = self._set_called
18+ self.patch(self.client.root, 'timeout_func', self._set_called)
19 self.client.login(APP_NAME, self.args)
20
21 self.assertEqual(self._called, False)
22@@ -860,8 +860,8 @@
23 assert self.client.root.ref_count > 0
24 func()
25
26- self.client.timeout_func = fake_timeout_func
27- self.client.shutdown_func = self._set_called
28+ self.patch(self.client.root, 'timeout_func', fake_timeout_func)
29+ self.patch(self.client.root, 'shutdown_func', self._set_called)
30
31 self.client.login(APP_NAME, self.args)
32 self.client.CredentialsFound(APP_NAME, TOKEN)
33@@ -877,8 +877,8 @@
34 assert self.client.root.ref_count == 0
35 func()
36
37- self.client.root.timeout_func = fake_timeout_func
38- self.client.root.shutdown_func = self._set_called
39+ self.patch(self.client.root, 'timeout_func', fake_timeout_func)
40+ self.patch(self.client.root, 'shutdown_func', self._set_called)
41
42 self.client.login(APP_NAME, self.args)
43 self.client.CredentialsFound(APP_NAME, TOKEN)

Subscribers

People subscribed via source and target branches