[CMF-checkins] CVS: Products/DCWorkflow/tests - test_DCWorkflow.py:1.4.2.3 test_all.py:1.9.2.1 test_roles.py:1.5.2.1

[Tres Seaver]

Update of /cvs-repository/Products/DCWorkflow/tests
In directory cvs.zope.org:/tmp/cvs-serv17354/DCWorkflow/tests

Modified Files:
      Tag: CMF-1_5-branch
	test_DCWorkflow.py test_all.py test_roles.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/DCWorkflow/tests/test_DCWorkflow.py 1.4.2.2 => 1.4.2.3 ===
--- Products/DCWorkflow/tests/test_DCWorkflow.py:1.4.2.2	Wed Jun 15 06:14:31 2005
+++ Products/DCWorkflow/tests/test_DCWorkflow.py	Fri Jul  8 08:28:31 2005
@@ -17,8 +17,11 @@
 
 from unittest import TestCase, 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 Products.CMFCore.tests.base.dummy import DummyContent
 from Products.CMFCore.tests.base.dummy import DummySite


=== Products/DCWorkflow/tests/test_all.py 1.9 => 1.9.2.1 ===
--- Products/DCWorkflow/tests/test_all.py:1.9	Thu Aug 12 11:07:44 2004
+++ Products/DCWorkflow/tests/test_all.py	Fri Jul  8 08:28:31 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
 


=== Products/DCWorkflow/tests/test_roles.py 1.5 => 1.5.2.1 ===
--- Products/DCWorkflow/tests/test_roles.py:1.5	Thu Aug 12 11:07:44 2004
+++ Products/DCWorkflow/tests/test_roles.py	Fri Jul  8 08:28:31 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.Application import Application