@@ -50,10 +50,8 @@ def genAssoc(issued, lifetime=600):
5050
5151 def checkRetrieve (url , handle = None , expected = None ):
5252 retrieved_assoc = store .getAssociation (url , handle )
53- if expected is None or store .isDumb ():
54- assert retrieved_assoc is None
55- else :
56- assert retrieved_assoc == expected , (retrieved_assoc , expected )
53+ assert retrieved_assoc == expected , (retrieved_assoc , expected )
54+ if expected is not None :
5755 if retrieved_assoc is expected :
5856 print ('Unexpected: retrieved a reference to the expected '
5957 'value instead of a new object' )
@@ -62,8 +60,7 @@ def checkRetrieve(url, handle=None, expected=None):
6260
6361 def checkRemove (url , handle , expected ):
6462 present = store .removeAssociation (url , handle )
65- expectedPresent = (not store .isDumb ()) and expected
66- assert bool (expectedPresent ) == bool (present )
63+ assert bool (expected ) == bool (present )
6764
6865 assoc = genAssoc (issued = 0 )
6966
@@ -155,7 +152,6 @@ def checkRemove(url, handle, expected):
155152 def checkUseNonce (nonce , expected , server_url ):
156153 stamp , salt = split (nonce )
157154 actual = store .useNonce (server_url , stamp , salt )
158- expected = store .isDumb () or expected
159155 assert bool (actual ) == bool (expected )
160156
161157 for url in [server_url , '' ]:
@@ -310,11 +306,6 @@ def test_postgresql():
310306 cursor .execute ('DROP DATABASE %s;' % (db_name ,))
311307 conn_remove .close ()
312308
313- def test_dumbstore ():
314- from openid .store import dumbstore
315- store = dumbstore .DumbStore ()
316- testStore (store )
317-
318309def test_memstore ():
319310 import _memstore
320311 testStore (_memstore .MemoryStore ())
@@ -324,7 +315,6 @@ def test():
324315 test_sqlite ()
325316 test_mysql ()
326317 test_postgresql ()
327- test_dumbstore ()
328318 test_memstore ()
329319
330320if __name__ == '__main__' :
0 commit comments