Canonical SSO provider

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

  1. readonly_test_fixes
  2. Merge into trunk
Proposed by David Owen
Status: Merged
Merged at revision: 61
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/readonly_test_fixes
Merge into: lp:canonical-identity-provider/release
Diff against target: 61 lines (+7/-5)
2 files modified
identityprovider/tests/test_command_readonly.py (+2/-0)
identityprovider/tests/test_readonly.py (+5/-5)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/readonly_test_fixes
Reviewer Review Type Date Requested Status
Anthony Lenton (community) Approve
Review via email: mp+27662@code.launchpad.net

Description of the change

This diff causes all tests to pass on my system.

To post a comment you must log in.
Revision history for this message
Anthony Lenton (elachuni) wrote :

Good catch!

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_command_readonly.py'
2--- identityprovider/tests/test_command_readonly.py 2010-05-05 16:26:28 +0000
3+++ identityprovider/tests/test_command_readonly.py 2010-06-15 22:51:25 +0000
4@@ -18,6 +18,8 @@
5
6
7 class ReadonlyCommandTestCase(SQLCachedTestCase):
8+ pgsql_functions = ['generate_openid_identifier']
9+
10 def setUp(self):
11 self._stdout = sys.stdout
12 self._stderr = sys.stderr
13
14=== modified file 'identityprovider/tests/test_readonly.py'
15--- identityprovider/tests/test_readonly.py 2010-05-28 14:53:52 +0000
16+++ identityprovider/tests/test_readonly.py 2010-06-15 22:51:25 +0000
17@@ -354,7 +354,7 @@
18
19 self.reset_csrf()
20
21- urllib2.urlopen = mock_urlopen
22+ urllib2.urlopen = old_urlopen
23
24 def test_update_server_all_appservers(self):
25 def mock_urlopen(req, data=None):
26@@ -380,7 +380,7 @@
27 ])
28
29 settings.APP_SERVERS = old_APP_SERVERS
30- urllib2.urlopen = mock_urlopen
31+ urllib2.urlopen = old_urlopen
32
33 def test_update_server_one_appserver(self):
34 def mock_urlopen(req, data=None):
35@@ -405,7 +405,7 @@
36 ])
37
38 settings.APP_SERVERS = old_APP_SERVERS
39- urllib2.urlopen = mock_urlopen
40+ urllib2.urlopen = old_urlopen
41
42 def test_update_server_one_connection(self):
43 def mock_urlopen(req, data=None):
44@@ -428,7 +428,7 @@
45 ])
46
47 settings.APP_SERVERS = old_APP_SERVERS
48- urllib2.urlopen = mock_urlopen
49+ urllib2.urlopen = old_urlopen
50
51 def test_update_server_clear_all(self):
52 def mock_urlopen(req, data=None):
53@@ -460,7 +460,7 @@
54 self.assertEqual(Session.objects.all().count(), 0)
55
56 settings.APP_SERVERS = old_APP_SERVERS
57- urllib2.urlopen = mock_urlopen
58+ urllib2.urlopen = old_urlopen
59
60
61 class ReadOnlyViews(InReadOnlyTestCase):