Update of /cvs-repository/Products/CMFTopic/tests
In directory cvs.zope.org:/tmp/cvs-serv17354/CMFTopic/tests
Modified Files:
Tag: CMF-1_5-branch
test_DateC.py test_ListC.py test_SIC.py test_SSC.py
test_SortC.py test_Topic.py test_all.py
Log Message:
- Moved tests which used to 'import Zope' to try 'import Zope2'
(with a fallback for Zope 2.7). Thanks to sacco for the patch!
(http://www.zope.org/Collectors/CMF/362)
=== Products/CMFTopic/tests/test_DateC.py 1.13.2.1 => 1.13.2.2 ===
--- Products/CMFTopic/tests/test_DateC.py:1.13.2.1 Wed Jun 15 06:14:30 2005
+++ Products/CMFTopic/tests/test_DateC.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
from DateTime.DateTime import DateTime
=== Products/CMFTopic/tests/test_ListC.py 1.11.2.1 => 1.11.2.2 ===
--- Products/CMFTopic/tests/test_ListC.py:1.11.2.1 Wed Jun 15 06:14:30 2005
+++ Products/CMFTopic/tests/test_ListC.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
from common import CriterionTestCase
=== Products/CMFTopic/tests/test_SIC.py 1.11.2.1 => 1.11.2.2 ===
--- Products/CMFTopic/tests/test_SIC.py:1.11.2.1 Wed Jun 15 06:14:30 2005
+++ Products/CMFTopic/tests/test_SIC.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
from common import CriterionTestCase
=== Products/CMFTopic/tests/test_SSC.py 1.10.2.1 => 1.10.2.2 ===
--- Products/CMFTopic/tests/test_SSC.py:1.10.2.1 Wed Jun 15 06:14:30 2005
+++ Products/CMFTopic/tests/test_SSC.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
from common import CriterionTestCase
=== Products/CMFTopic/tests/test_SortC.py 1.6.2.1 => 1.6.2.2 ===
--- Products/CMFTopic/tests/test_SortC.py:1.6.2.1 Wed Jun 15 06:14:30 2005
+++ Products/CMFTopic/tests/test_SortC.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
from common import CriterionTestCase
=== Products/CMFTopic/tests/test_Topic.py 1.15.2.1 => 1.15.2.2 ===
--- Products/CMFTopic/tests/test_Topic.py:1.15.2.1 Wed Jun 15 06:14:30 2005
+++ Products/CMFTopic/tests/test_Topic.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
from Acquisition import Implicit
=== Products/CMFTopic/tests/test_all.py 1.8 => 1.8.2.1 ===
--- Products/CMFTopic/tests/test_all.py:1.8 Thu Aug 12 11:07:43 2004
+++ Products/CMFTopic/tests/test_all.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
from unittest import main
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
from Products.CMFCore.tests.base.utils import build_test_suite
_______________________________________________
CMF-checkins mailing list
[email protected]
http://mail.zope.org/mailman/listinfo/cmf-checkins
