Fix test_115_TestSerializationTagSQLDictPreventsParallelExecution. Delete...

Fix test_115_TestSerializationTagSQLDictPreventsParallelExecution. Delete remaining activities at the end. This broke other test.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28705 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/CMFActivity/tests/testCMFActivity.py

@@ -3409,25 +3409,30 @@ class TestCMFActivity(ERP5TypeTestCase):
                                                    offset=0,
                                                    count=1000)
 
-    self.assertEqual(len([message
-                          for message in result
-                          if (message.processing_node>0 and
-                              message.processing==1 and
-                              message.serialization_tag=='test_115')]),
-                     1)
-
-    self.assertEqual(len([message
-                          for message in result
-                          if (message.processing_node==-1 and
-                              message.serialization_tag=='test_115')]),
-                     3)
-
-    self.assertEqual(len([message
-                          for message in result
-                          if (message.processing_node>0 and
-                              message.processing==1 and
-                              message.serialization_tag=='')]),
-                     1)
+    try:
+      self.assertEqual(len([message
+                            for message in result
+                            if (message.processing_node>0 and
+                                message.processing==1 and
+                                message.serialization_tag=='test_115')]),
+                       1)
+
+      self.assertEqual(len([message
+                            for message in result
+                            if (message.processing_node==-1 and
+                                message.serialization_tag=='test_115')]),
+                       3)
+
+      self.assertEqual(len([message
+                            for message in result
+                            if (message.processing_node>0 and
+                                message.processing==1 and
+                                message.serialization_tag=='')]),
+                       1)
+    finally:
+      # Clear activities from all nodes
+      activity_tool.SQLDict_delMessage(uid=[message.uid for message in result])
+      get_transaction().commit()
 
 def test_suite():
   suite = unittest.TestSuite()