From d5976297aaaf091cebb91ebabadff05ff4567ab1 Mon Sep 17 00:00:00 2001 From: Julien Muchembled <jm@nexedi.com> Date: Mon, 24 May 2010 14:52:20 +0000 Subject: [PATCH] Unit tests: add msecs to zLOG.log + improvements to _testInvalidationBug git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35574 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5/tests/_testInvalidationBug.py | 24 ++++++++++++++-------- product/ERP5Type/tests/runUnitTest.py | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/product/ERP5/tests/_testInvalidationBug.py b/product/ERP5/tests/_testInvalidationBug.py index b7f7a7f355..e713882b7f 100644 --- a/product/ERP5/tests/_testInvalidationBug.py +++ b/product/ERP5/tests/_testInvalidationBug.py @@ -52,12 +52,17 @@ class TestInvalidationBug(ERP5TypeTestCase): self.login() def testReindex(self): - self.login() + print("To reproduce bugs easily, distribution step should be skipped for" + " SQLDict, by writing messages with processing_node already at 0." + " This can be done easily by patching SQLDict_writeMessageList.") module = self.getPortalObject().organisation_module + module.newContent() module.setIdGenerator('_generatePerDayId') - module.migrateToHBTree() + #module.migrateToHBTree() transaction.commit() self.tic() + print 'OID(%s) = %r' % (module.getRelativeUrl(), module._p_oid) + print ' OID(_tree) = %r' % module._tree._p_oid previous = DateTime() skin_folder = self.getPortal().portal_skins.custom if 'create_script' in skin_folder.objectIds(): @@ -71,19 +76,20 @@ for x in xrange(0, 1): id_list.append(organisation.getId()) log('Created Organisations', (context,id_list)) #log('All organisations', (context,[x for x in context.objectIds()])) -context.activate(activity='SQLQueue').create_script() +context.activate(activity='SQLQueue', priority=2).create_script() count = len(context) log('Organisation #', count) -if not (count % 500): - if count == 500: - context.setProperty('perf_start', DateTime()) +if (count % 500) < 5: + start = context.getProperty('perf_start') + if start is None: + context.setProperty('perf_start', (count, DateTime())) else: - log('creation speed: %s obj/s' % ((count - 500) / - (86400 * (DateTime() - context.getProperty('perf_start'))))) + log('creation speed: %s obj/s' % ((count - start[0]) / + (86400 * (DateTime() - start[1])))) """) for x in xrange(0,200): - module.activate(activity='SQLQueue').create_script() + module.activate(activity='SQLQueue', priority=2).create_script() transaction.commit() self.tic() diff --git a/product/ERP5Type/tests/runUnitTest.py b/product/ERP5Type/tests/runUnitTest.py index 151b977946..25018485bb 100755 --- a/product/ERP5Type/tests/runUnitTest.py +++ b/product/ERP5Type/tests/runUnitTest.py @@ -386,7 +386,7 @@ def runUnitTestList(test_list, verbosity=1, debug=0): from ZConfig.components.logger.logger import EventLogFactory import logging section = SectionValue({'dateformat': '%Y-%m-%d %H:%M:%S', - 'format': '%(asctime)s %(levelname)s %(name)s %(message)s', + 'format': '%(asctime)s.%(msecs)03d %(levelname)s %(name)s %(message)s', 'level': logging.INFO, 'path': os.environ['EVENT_LOG_FILE'], 'max_size': None, -- 2.30.9