Commit acb295e7 authored by Nicolas Delaby's avatar Nicolas Delaby

Update test to follow r29063

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29065 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 23abba58
...@@ -193,14 +193,14 @@ return result ...@@ -193,14 +193,14 @@ return result
from Products.ERP5Type.Cache import CachingMethod from Products.ERP5Type.Cache import CachingMethod
py_script_id = "testCachedMethod" py_script_id = "testCachedMethod"
py_script_obj = getattr(portal, py_script_id) py_script_obj = getattr(portal, py_script_id)
for cf_name in ('ram_cache_factory', for cf_name, clear_allowed in (('ram_cache_factory', True),
'distributed_ram_cache_factory', ('distributed_ram_cache_factory', False),
'distributed_persistent_cache_factory', ('distributed_persistent_cache_factory', False),
): ):
my_cache = CachingMethod(py_script_obj, my_cache = CachingMethod(py_script_obj,
'py_script_obj', 'py_script_obj',
cache_factory=cf_name) cache_factory=cf_name)
self._cacheFactoryInstanceTest(my_cache, cf_name) self._cacheFactoryInstanceTest(my_cache, cf_name, clear_allowed)
def test_02_CacheFactoryMultiPlugins(self): def test_02_CacheFactoryMultiPlugins(self):
""" Test a cache factory containing multiple cache plugins. """ """ Test a cache factory containing multiple cache plugins. """
...@@ -212,9 +212,9 @@ return result ...@@ -212,9 +212,9 @@ return result
my_cache = CachingMethod(py_script_obj, my_cache = CachingMethod(py_script_obj,
'py_script_obj', 'py_script_obj',
cache_factory=cf_name) cache_factory=cf_name)
self._cacheFactoryInstanceTest(my_cache, cf_name) self._cacheFactoryInstanceTest(my_cache, cf_name, clear_allowed=False)
def _cacheFactoryInstanceTest(self, my_cache, cf_name): def _cacheFactoryInstanceTest(self, my_cache, cf_name, clear_allowed):
portal = self.getPortal() portal = self.getPortal()
print print
print "="*40 print "="*40
...@@ -248,6 +248,7 @@ return result ...@@ -248,6 +248,7 @@ return result
self.assertEquals(original, cached) self.assertEquals(original, cached)
## OK so far let's clear cache ## OK so far let's clear cache
if clear_allowed:
portal.portal_caches.clearCacheFactory(cf_name) portal.portal_caches.clearCacheFactory(cf_name)
## 1st call ## 1st call
...@@ -279,6 +280,9 @@ return result ...@@ -279,6 +280,9 @@ return result
def test_04_CheckConcurrentRamCacheDict(self): def test_04_CheckConcurrentRamCacheDict(self):
"""Check that all RamCache doesn't clear the same cache_dict """Check that all RamCache doesn't clear the same cache_dict
""" """
print
print "="*40
print "TESTING: Concurrent RamCache"
portal = self.getPortal() portal = self.getPortal()
nb_iterations = 30000 nb_iterations = 30000
from Products.ERP5Type.Cache import CachingMethod from Products.ERP5Type.Cache import CachingMethod
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment