[CMF-checkins] CVS: CMF/CMFSetup/tests - test_actions.py:1.9.2.3
test_all.py:1.15.2.2 test_context.py:1.12.2.1
test_differ.py:1.3.2.1 test_properties.py:1.1.2.2
test_registry.py:1.15.2.2 test_rolemap.py:1.7.2.2
test_skins.py:1.9.2.7 test_tool.py:1.15.2.3
test_typeinfo.py:1.10.2.4 test_utils.py:1.4.2.4
test_workflow.py:1.24.2.5
Tres Seaver
tseaver at palladion.com
Fri Jul 8 08:29:01 EDT 2005
Update of /cvs-repository/CMF/CMFSetup/tests
In directory cvs.zope.org:/tmp/cvs-serv17354/CMFSetup/tests
Modified Files:
Tag: CMF-1_5-branch
test_actions.py test_all.py test_context.py test_differ.py
test_properties.py test_registry.py test_rolemap.py
test_skins.py test_tool.py test_typeinfo.py test_utils.py
test_workflow.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)
=== CMF/CMFSetup/tests/test_actions.py 1.9.2.2 => 1.9.2.3 ===
--- CMF/CMFSetup/tests/test_actions.py:1.9.2.2 Wed Apr 13 09:05:02 2005
+++ CMF/CMFSetup/tests/test_actions.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
import unittest
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
from Acquisition import aq_parent
=== CMF/CMFSetup/tests/test_all.py 1.15.2.1 => 1.15.2.2 ===
--- CMF/CMFSetup/tests/test_all.py:1.15.2.1 Fri Dec 17 12:49:40 2004
+++ CMF/CMFSetup/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/CMFSetup/tests/test_context.py 1.12 => 1.12.2.1 ===
--- CMF/CMFSetup/tests/test_context.py:1.12 Thu Aug 12 11:07:41 2004
+++ CMF/CMFSetup/tests/test_context.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
import os
import time
=== CMF/CMFSetup/tests/test_differ.py 1.3 => 1.3.2.1 ===
--- CMF/CMFSetup/tests/test_differ.py:1.3 Thu Aug 12 11:07:41 2004
+++ CMF/CMFSetup/tests/test_differ.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
from OFS.Folder import Folder
from OFS.Image import File
=== CMF/CMFSetup/tests/test_properties.py 1.1.2.1 => 1.1.2.2 ===
--- CMF/CMFSetup/tests/test_properties.py:1.1.2.1 Fri Dec 17 12:49:40 2004
+++ CMF/CMFSetup/tests/test_properties.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
from OFS.Folder import Folder
=== CMF/CMFSetup/tests/test_registry.py 1.15.2.1 => 1.15.2.2 ===
--- CMF/CMFSetup/tests/test_registry.py:1.15.2.1 Tue Apr 5 11:17:17 2005
+++ CMF/CMFSetup/tests/test_registry.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
from OFS.Folder import Folder
from Products.CMFSetup.tests.common import BaseRegistryTests
=== CMF/CMFSetup/tests/test_rolemap.py 1.7.2.1 => 1.7.2.2 ===
--- CMF/CMFSetup/tests/test_rolemap.py:1.7.2.1 Tue Dec 14 15:56:26 2004
+++ CMF/CMFSetup/tests/test_rolemap.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
from OFS.Folder import Folder
=== CMF/CMFSetup/tests/test_skins.py 1.9.2.6 => 1.9.2.7 ===
--- CMF/CMFSetup/tests/test_skins.py:1.9.2.6 Sat May 7 08:44:18 2005
+++ CMF/CMFSetup/tests/test_skins.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
import os
=== CMF/CMFSetup/tests/test_tool.py 1.15.2.2 => 1.15.2.3 ===
--- CMF/CMFSetup/tests/test_tool.py:1.15.2.2 Tue Apr 5 11:17:17 2005
+++ CMF/CMFSetup/tests/test_tool.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
from StringIO import StringIO
=== CMF/CMFSetup/tests/test_typeinfo.py 1.10.2.3 => 1.10.2.4 ===
--- CMF/CMFSetup/tests/test_typeinfo.py:1.10.2.3 Fri Jul 1 09:27:45 2005
+++ CMF/CMFSetup/tests/test_typeinfo.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
from OFS.Folder import Folder
from OFS.SimpleItem import SimpleItem
=== CMF/CMFSetup/tests/test_utils.py 1.4.2.3 => 1.4.2.4 ===
--- CMF/CMFSetup/tests/test_utils.py:1.4.2.3 Fri Jul 1 09:27:45 2005
+++ CMF/CMFSetup/tests/test_utils.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
import unittest
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
from OFS.Folder import Folder
=== CMF/CMFSetup/tests/test_workflow.py 1.24.2.4 => 1.24.2.5 ===
--- CMF/CMFSetup/tests/test_workflow.py:1.24.2.4 Thu Jul 7 11:33:13 2005
+++ CMF/CMFSetup/tests/test_workflow.py Fri Jul 8 08:28:30 2005
@@ -17,8 +17,11 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+try:
+ import Zope2
+except: # BBB: for Zope 2.7
+ import Zope as Zope2
+Zope2.startup()
from OFS.Folder import Folder
from Products.PythonScripts.PythonScript import PythonScript
More information about the CMF-checkins
mailing list