From a80728c4a4efc4087f312a2ef23729c157d40808 Mon Sep 17 00:00:00 2001 From: Julien Muchembled <jm@nexedi.com> Date: Wed, 16 May 2012 14:44:11 +0200 Subject: [PATCH] testConflictResolution & testInvalidationBug still need to import 'transaction' This revert a wrong change in commit 8995b64508f6d7c0fee1ef475de3dc3145ddc84d --- .../TestTemplateItem/testConflictResolution.py | 1 + bt5/test_conflict_resolution/bt/revision | 2 +- product/ERP5/tests/testInvalidationBug.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bt5/test_conflict_resolution/TestTemplateItem/testConflictResolution.py b/bt5/test_conflict_resolution/TestTemplateItem/testConflictResolution.py index 4e02bfcf5a..a6ef28c1fa 100644 --- a/bt5/test_conflict_resolution/TestTemplateItem/testConflictResolution.py +++ b/bt5/test_conflict_resolution/TestTemplateItem/testConflictResolution.py @@ -28,6 +28,7 @@ import unittest import urllib +import transaction import ZODB from ZODB.DemoStorage import DemoStorage from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase diff --git a/bt5/test_conflict_resolution/bt/revision b/bt5/test_conflict_resolution/bt/revision index d8263ee986..e440e5c842 100644 --- a/bt5/test_conflict_resolution/bt/revision +++ b/bt5/test_conflict_resolution/bt/revision @@ -1 +1 @@ -2 \ No newline at end of file +3 \ No newline at end of file diff --git a/product/ERP5/tests/testInvalidationBug.py b/product/ERP5/tests/testInvalidationBug.py index 42c7ca87ea..0ae8d96ac7 100644 --- a/product/ERP5/tests/testInvalidationBug.py +++ b/product/ERP5/tests/testInvalidationBug.py @@ -33,6 +33,7 @@ import threading import time import unittest import urllib +import transaction from DateTime import DateTime from Testing import ZopeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase -- 2.30.9