Canonical SSO provider

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

  1. deprecated-mock
  2. Merge into trunk
Proposed by David Owen
Status: Merged
Approved by: Simon Davy
Approved revision: no longer in the source branch.
Merged at revision: 249
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/deprecated-mock
Merge into: lp:canonical-identity-provider/release
Diff against target: 33 lines (+3/-7)
1 file modified
identityprovider/tests/test_decorators.py (+3/-7)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/deprecated-mock
Reviewer Review Type Date Requested Status
Canonical ISD hackers Pending
Review via email: mp+86432@code.launchpad.net

Commit message

Updated for deprecate Mock.patch_object

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'identityprovider/tests/test_decorators.py'
2--- identityprovider/tests/test_decorators.py 2011-08-11 14:07:16 +0000
3+++ identityprovider/tests/test_decorators.py 2011-12-20 17:10:14 +0000
4@@ -1,11 +1,7 @@
5 from datetime import datetime
6 from django.test import TestCase
7
8-from mock import (
9- Mock,
10- patch,
11- patch_object,
12-)
13+from mock import Mock, patch
14
15 from identityprovider.decorators import ratelimit
16
17@@ -18,7 +14,7 @@
18
19 request = Mock()
20 limiter = ratelimit()
21- with patch_object(limiter, 'key_extra') as mock_key_extra:
22+ with patch.object(limiter, 'key_extra') as mock_key_extra:
23 mock_key_extra.return_value = None
24 limiter.keys_to_check(request)
25
26@@ -31,7 +27,7 @@
27
28 request = Mock()
29 limiter = ratelimit()
30- with patch_object(limiter, 'key_extra') as mock_key_extra:
31+ with patch.object(limiter, 'key_extra') as mock_key_extra:
32 mock_key_extra.return_value = None
33 limiter.current_key(request)
34