[Erp5-report] r30911 - in /erp5/trunk/products/ERP5OOo/tests: testDms.py testIngestion.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Sun Nov 29 08:03:08 CET 2009
Author: jm
Date: Sun Nov 29 08:03:07 2009
New Revision: 30911
URL: http://svn.erp5.org?rev=30911&view=rev
Log:
Delete failed activities in beforeTearDown so that following tests work
Modified:
erp5/trunk/products/ERP5OOo/tests/testDms.py
erp5/trunk/products/ERP5OOo/tests/testIngestion.py
Modified: erp5/trunk/products/ERP5OOo/tests/testDms.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testDms.py?rev=30911&r1=30910&r2=30911&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testDms.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testDms.py [utf8] Sun Nov 29 08:03:07 2009
@@ -141,17 +141,22 @@
Do some stuff after each test:
- clear document module
"""
+ transaction.abort()
+ activity_tool = self.portal.portal_activities
+ activity_status = set(m.processing_node < -1
+ for m in activity_tool.getMessageList())
+ if True in activity_status:
+ activity_tool.manageClearActivities()
+ else:
+ assert not activity_status
self.clearDocumentModule()
def clearDocumentModule(self):
"""
Remove everything after each run
"""
- transaction.abort()
- self.tic()
doc_module = self.getDocumentModule()
- ids = [i for i in doc_module.objectIds()]
- doc_module.manage_delObjects(ids)
+ doc_module.manage_delObjects(list(doc_module.objectIds()))
transaction.commit()
self.tic()
@@ -582,6 +587,7 @@
response.headers['content-type'])
self.assertEquals('attachment; filename="import_data_list.ods"',
response.headers['content-disposition'])
+ self.tic()
def test_Member_download_pdf_format(self):
# tests that members can download OOo documents in pdf format (at least in
Modified: erp5/trunk/products/ERP5OOo/tests/testIngestion.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testIngestion.py?rev=30911&r1=30910&r2=30911&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testIngestion.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testIngestion.py [utf8] Sun Nov 29 08:03:07 2009
@@ -113,6 +113,13 @@
self.setTools()
def beforeTearDown(self):
+ activity_tool = self.portal.portal_activities
+ activity_status = set(m.processing_node < -1
+ for m in activity_tool.getMessageList())
+ if True in activity_status:
+ activity_tool.manageClearActivities()
+ else:
+ assert not activity_status
self.portal.portal_caches.clearAllCache()
def setSystemPreference(self):
@@ -1197,6 +1204,7 @@
step_list = [ 'stepCleanUp'
,'stepCreatePDFDocument'
,'stepExportPDF'
+ ,'stepTic'
]
self.playSequence(step_list, quiet)
@@ -1231,6 +1239,7 @@
,'stepDeleteSnapshot'
,'stepCheckHasNoSnapshot'
,'stepCreateSnapshot'
+ ,'stepTic'
]
self.playSequence(step_list, quiet)
More information about the Erp5-report
mailing list