Canonical SSO provider

Merge lp:~canonical-isd-hackers/canonical-identity-provider/mock-update into lp:canonical-identity-provider/release

  1. mock-update
  2. Merge into trunk
Proposed by Michael Foord
Status: Merged
Approved by: David Owen
Approved revision: no longer in the source branch.
Merged at revision: 194
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/mock-update
Merge into: lp:canonical-identity-provider/release
Diff against target: 193 lines (+19/-20)
6 files modified
identityprovider/tests/test_auth.py (+5/-6)
identityprovider/tests/test_command_cleanup.py (+2/-2)
identityprovider/tests/test_models_captcha.py (+8/-8)
identityprovider/tests/test_views_ui.py (+2/-2)
requirements.txt (+1/-1)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/mock-update
Reviewer Review Type Date Requested Status
David Owen (community) Approve
Review via email: mp+69130@code.launchpad.net

Description of the change

Update the version of mock to 0.7.2

To post a comment you must log in.
Revision history for this message
David Owen (dsowen) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'identityprovider/tests/test_auth.py'
2--- identityprovider/tests/test_auth.py 2011-07-15 15:17:19 +0000
3+++ identityprovider/tests/test_auth.py 2011-07-25 16:53:35 +0000
4@@ -5,7 +5,6 @@
5 from mock import (
6 Mock,
7 patch,
8- patch_object,
9 )
10 from oauth_backend.models import Consumer
11 from piston.oauth import OAuthError as PistonOAuthError
12@@ -171,19 +170,19 @@
13
14 def test_is_authenticated_invalid_request(self):
15 mock_is_valid_request = Mock(return_value=False)
16- with patch_object(self.auth, 'is_valid_request', mock_is_valid_request):
17+ with patch.object(self.auth, 'is_valid_request', mock_is_valid_request):
18 self.assertEqual(self.auth.is_authenticated(self.request), False)
19
20 def test_is_authenticated_piston_oauth_error(self):
21 mock_validate_token = Mock(side_effect=PistonOAuthError)
22- with patch_object(self.auth, 'validate_token', mock_validate_token):
23+ with patch.object(self.auth, 'validate_token', mock_validate_token):
24 self.assertEqual(self.auth.is_authenticated(self.request), False)
25
26 def test_is_authenticated_no_consumer_token(self):
27 consumer, token, params = None, None, None
28 mock_validate_token = Mock(return_value=(consumer, token, params))
29 # authentication fails as there is no consumer and token in the request
30- with patch_object(self.auth, 'validate_token', mock_validate_token):
31+ with patch.object(self.auth, 'validate_token', mock_validate_token):
32 self.assertEqual(self.auth.is_authenticated(self.request), False)
33
34 @patch('identityprovider.auth.Account.objects.get')
35@@ -194,7 +193,7 @@
36 consumer, token, params = Mock(), Mock(), None
37 # make sure validate_token returns a consumer and a token
38 mock_validate_token = Mock(return_value=(consumer, token, params))
39- with patch_object(self.auth, 'validate_token', mock_validate_token):
40+ with patch.object(self.auth, 'validate_token', mock_validate_token):
41 self.assertEqual(self.auth.is_authenticated(self.request), False)
42
43 @patch('identityprovider.auth.Account.objects.get')
44@@ -206,7 +205,7 @@
45 consumer, params = Mock(), None
46 # make sure validate_token returns a consumer and a token
47 mock_validate_token = Mock(return_value=(consumer, mock_token, params))
48- with patch_object(self.auth, 'validate_token', mock_validate_token):
49+ with patch.object(self.auth, 'validate_token', mock_validate_token):
50 response = self.auth.is_authenticated(self.request)
51
52 self.assertEqual(response, True)
53
54=== modified file 'identityprovider/tests/test_command_cleanup.py'
55--- identityprovider/tests/test_command_cleanup.py 2011-07-15 11:50:53 +0000
56+++ identityprovider/tests/test_command_cleanup.py 2011-07-25 16:53:35 +0000
57@@ -8,7 +8,7 @@
58 from django.core.management import call_command
59 from django.db import connection
60 from django.test import TestCase
61-from mock import patch_object
62+from mock import patch
63
64 from identityprovider.models import OpenIDNonce
65
66@@ -34,7 +34,7 @@
67 self.populate()
68
69 mock_stdout = StringIO()
70- with patch_object(sys, 'stdout', mock_stdout):
71+ with patch.object(sys, 'stdout', mock_stdout):
72 call_command('cleanup', verbosity=0)
73 mock_stdout.seek(0)
74 self.assertTrue('No items selected to clean up.' in mock_stdout.read())
75
76=== modified file 'identityprovider/tests/test_models_captcha.py'
77--- identityprovider/tests/test_models_captcha.py 2011-01-20 21:48:43 +0000
78+++ identityprovider/tests/test_models_captcha.py 2011-07-25 16:53:35 +0000
79@@ -4,7 +4,7 @@
80 import unittest
81 import urllib2
82
83-from mock import patch_object
84+from mock import patch
85
86 from cStringIO import StringIO
87 from django.conf import settings
88@@ -37,11 +37,11 @@
89
90 class CaptchaTestCase(unittest.TestCase):
91
92- @patch_object(Captcha, '_open')
93+ @patch.object(Captcha, '_open')
94 def test_new_captcha_error(self, mock_open):
95 self.assertRaises(NewCaptchaError, Captcha.new)
96
97- @patch_object(Captcha, '_open')
98+ @patch.object(Captcha, '_open')
99 def test_new_captcha_no_challenge(self, mock_open):
100 try:
101 Captcha.new()
102@@ -70,14 +70,14 @@
103 def tearDown(self):
104 settings.DISABLE_CAPTCHA_VERIFICATION = self.old_DISABLE_CAPTCHA_VERIFICATION
105
106- @patch_object(Captcha, '_open')
107+ @patch.object(Captcha, '_open')
108 def test_verify_already_verified(self, mock_open):
109 c = Captcha(None)
110 c._verified = True
111 r = c.verify(None, None)
112 self.assertTrue(r)
113
114- @patch_object(Captcha, '_open')
115+ @patch.object(Captcha, '_open')
116 def test_verify_no_verification(self, mock_open):
117 settings.DISABLE_CAPTCHA_VERIFICATION = True
118
119@@ -85,7 +85,7 @@
120 r = c.verify(None, None)
121 self.assertTrue(r)
122
123- @patch_object(Captcha, '_open')
124+ @patch.object(Captcha, '_open')
125 def test_verify_response_ok(self, mock_open):
126 @classmethod
127 def mock_open(cls, request):
128@@ -102,7 +102,7 @@
129
130 Captcha._open = old_open
131
132- @patch_object(Captcha, '_open')
133+ @patch.object(Captcha, '_open')
134 def test_verify_no_captcha_id(self, mock_open):
135 c = Captcha(None)
136 r = c.verify(None, 'localhost')
137@@ -110,7 +110,7 @@
138 self.assertFalse(r)
139 self.assertEqual(c.message, 'no-challenge')
140
141- @patch_object(Captcha, '_open')
142+ @patch.object(Captcha, '_open')
143 def test_verify_error(self, mock_open):
144 c = Captcha(None)
145 c.captcha_id = 'challenge-id'
146
147=== modified file 'identityprovider/tests/test_views_ui.py'
148--- identityprovider/tests/test_views_ui.py 2011-07-19 14:21:42 +0000
149+++ identityprovider/tests/test_views_ui.py 2011-07-25 16:53:35 +0000
150@@ -7,7 +7,7 @@
151 import urllib2
152 from urlparse import urlsplit
153
154-from mock import patch_object, patch
155+from mock import patch
156
157 from django.conf import settings
158 from django.core import mail
159@@ -635,7 +635,7 @@
160 self.assertEqual(len(mail.outbox), mails_sent)
161 mail.outbox = []
162
163- @patch_object(logging.Logger, 'debug')
164+ @patch.object(logging.Logger, 'debug')
165 def test_new_account_when_person_exists_and_account_not(self, mock_debug):
166 person = Person.objects.create(displayname='Person')
167 EmailAddress.objects.create(email='person@example.com',
168
169=== modified file 'requirements.txt'
170--- requirements.txt 2011-07-12 14:38:02 +0000
171+++ requirements.txt 2011-07-25 16:53:35 +0000
172@@ -6,7 +6,7 @@
173 NoseDjango==0.8.1
174 nosexcover
175 coverage==3.4
176-mock==0.6.0
177+mock==0.7.2
178 wsgiref==0.1.2
179 wsgi-intercept==0.4
180 zope.testbrowser==3.5.1
181
182=== modified file 'setup.py'
183--- setup.py 2011-07-06 17:36:56 +0000
184+++ setup.py 2011-07-25 16:53:35 +0000
185@@ -39,7 +39,7 @@
186 'NoseDjango==0.8.1',
187 'nosexcover',
188 'coverage==3.4',
189- 'mock==0.6.0',
190+ 'mock==0.7.2',
191 'wsgiref==0.1.2',
192 'wsgi-intercept==0.4',
193 'zope.testbrowser==3.5.1',