Skip to content

Commit bec1296

Browse files
author
Josh Hoyt
committed
[project @ Added test for discovery returning no services]
1 parent 29677ac commit bec1296

1 file changed

Lines changed: 32 additions & 7 deletions

File tree

‎openid/test/test_consumer.py‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,29 +1190,54 @@ def setUp(self):
11901190
self.identity_url,
11911191
self.consumer.session_key_prefix)
11921192

1193-
def test_beginFailure(self):
1194-
"""Make sure that the discovery failure case behaves properly
1195-
"""
1193+
def withDummyDiscovery(self, callable, dummy_getNextService):
11961194
class DummyDisco(object):
11971195
def __init__(self, *ignored):
11981196
pass
11991197

1200-
def getNextService(self, ignored):
1201-
raise HTTPFetchingError("Unit test")
1198+
getNextService = dummy_getNextService
12021199

12031200
import openid.consumer.consumer
12041201
old_discovery = openid.consumer.consumer.Discovery
12051202
try:
12061203
openid.consumer.consumer.Discovery = DummyDisco
1204+
callable()
1205+
finally:
1206+
openid.consumer.consumer.Discovery = old_discovery
1207+
1208+
def test_beginHTTPError(self):
1209+
"""Make sure that the discovery HTTP failure case behaves properly
1210+
"""
1211+
def getNextService(self, ignored):
1212+
raise HTTPFetchingError("Unit test")
1213+
1214+
def test():
12071215
try:
12081216
self.consumer.begin('unused in this test')
12091217
except DiscoveryFailure, why:
12101218
self.failUnless(why[0].startswith('Error fetching'))
12111219
self.failIf(why[0].find('Unit test') == -1)
12121220
else:
12131221
self.fail('Expected DiscoveryFailure')
1214-
finally:
1215-
openid.consumer.consumer.Discovery = old_discovery
1222+
1223+
self.withDummyDiscovery(test, getNextService)
1224+
1225+
def test_beginNoServices(self):
1226+
def getNextService(self, ignored):
1227+
return None
1228+
1229+
url = 'http://a.user.url/'
1230+
def test():
1231+
try:
1232+
self.consumer.begin(url)
1233+
except DiscoveryFailure, why:
1234+
self.failUnless(why[0].startswith('No usable OpenID'))
1235+
self.failIf(why[0].find(url) == -1)
1236+
else:
1237+
self.fail('Expected DiscoveryFailure')
1238+
1239+
self.withDummyDiscovery(test, getNextService)
1240+
12161241

12171242
def test_beginWithoutDiscovery(self):
12181243
# Does this really test anything non-trivial?

0 commit comments

Comments
 (0)