Changeset 443
- Timestamp:
- 07/10/05 10:19:22
- Files:
-
- trunk/cherrypy/_cputil.py (modified) (1 diff)
- trunk/cherrypy/test/test_session_filter.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cputil.py
r408 r443 211 211 _cpDefaultInputFilterList = [] 212 212 _cpDefaultOutputFilterList = [] 213 213 _cpDefaultFilterInstances = {} 214 214 215 for filterName in __cpDefaultInputFilters: 215 216 filterClass = _cpDefaultFilterClasses[filterName] 216 filterInstance = _cpDefaultFilterInstances .setdefault(filterName, filterClass())217 filterInstance = _cpDefaultFilterInstances[filterName] = filterClass() 217 218 _cpDefaultInputFilterList.append(filterInstance) 218 219 trunk/cherrypy/test/test_session_filter.py
r442 r443 78 78 anydb.exposed = True 79 79 80 81 import threading 82 80 83 cherrypy.root = TestSite() 81 84 cherrypy.config.update(server_conf.copy()) 82 85 83 import threading 86 def reloadCP(): 87 reload(cherrypy) 88 cherrypy.config.update(server_conf.copy()) 89 cherrypy.server.start(initOnly = True) 84 90 85 91 class SessionFilterTest(unittest.TestCase): 86 92 87 persistantCookies = [] 88 89 def __testStorageType(self, storageType, startCount = 1, iterations = 4): 93 def __testStorageType(self, storageType, startCount = 1, iterations = 5, persistant=False): 90 94 #cherrypy.config.update({"sessionFilter.storageType": storageType}) 91 95 … … 97 101 # this loop will be used to test thread safety 98 102 for n in xrange(startCount+1, startCount + iterations + 1): 103 if persistant: 104 cherrypy.server.stop() 105 cherrypy.server.start(initOnly = True) 99 106 helper.request('/' + storageType, [('Cookie', cookie)]) 100 107 self.assertEqual(cherrypy.response.body, str(n)) 101 108 109 def __testCleanUp(self, storageType): 110 pass 111 112 def __testCacheCleanUp(self, storageType): 113 pass 114 102 115 def testRamSessions(self): 103 self.__testStorageType('ram' )116 self.__testStorageType('ram', persistant=False) 104 117 105 118 def testFileSessions(self): 106 self.__testStorageType('file' )119 self.__testStorageType('file', persistant=True) 107 120 108 121 def testAnydbSessions(self): 109 self.__testStorageType('anydb' )122 self.__testStorageType('anydb', persistant=True) 110 123 111 def testThreadSafety(self, storageType = 'ram'): 112 for z in range(3): 113 try: 114 threading.Thread(target = self.__testStorageType, args = ('ram', 1, 4)).start() 115 except: 116 pass 117 124 def __testThreadSafety(self, storageType = 'ram'): 125 for z in range(30): 126 threading.Thread(target = self.__testStorageType, args = ('ram', 1, 4)).start() 127 118 128 ''' 119 129 def testSqlObjectSession(self): … … 126 136 except OSError: 127 137 pass 128 129 cherrypy.server.start(initOnly=True) 130 try: 131 unittest.main() 132 except SystemExit: 133 pass 134 #shutil.rmtree(tmpFolder) 135 #os.rmdir(tmpFolder) 138 139 cherrypy.server.start(initOnly = True) 140 unittest.main()
