From bdea9606a5225f9c5f58a96066e137c75a7bfdb0 Mon Sep 17 00:00:00 2001
From: Yoshinori Okuji <yo@nexedi.com>
Date: Wed, 7 Nov 2007 15:55:26 +0000
Subject: [PATCH] Disable a meaningless check.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17461 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/CMFActivity/tests/testCMFActivity.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/product/CMFActivity/tests/testCMFActivity.py b/product/CMFActivity/tests/testCMFActivity.py
index 06429f0769..a148cdf68a 100644
--- a/product/CMFActivity/tests/testCMFActivity.py
+++ b/product/CMFActivity/tests/testCMFActivity.py
@@ -1780,8 +1780,16 @@ class TestCMFActivity(ERP5TypeTestCase):
# Usual abort should not remove a read conflict error.
organisation = module[organisation_id]
self.assertRaises(ReadConflictError, getattr, organisation, 'uid')
- get_transaction().abort()
- self.assertRaises(ReadConflictError, getattr, organisation, 'uid')
+
+ # In Zope 2.7, abort does not sync automatically, so even after abort,
+ # ReadConflictError is raised. But in Zope 2.8, this is automatic, so
+ # abort has the same effect as abortTransactionSynchronously.
+ #
+ # In reality, we do not care about whether abort raises or not
+ # at this point. We are only interested in whether
+ # abortTransactionSynchronously works expectedly.
+ #get_transaction().abort()
+ #self.assertRaises(ReadConflictError, getattr, organisation, 'uid')
# Synchronous abort.
from Products.CMFActivity.Activity.Queue import abortTransactionSynchronously
--
2.30.9