[CMF-checkins] CVS: Products/DCWorkflow/tests - test_DCWorkflow.py:1.6.2.1 test_all.py:1.9.8.1 test_roles.py:1.5.8.1

[Tres Seaver]

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

Modified Files:
      Tag: tseaver-z28_only-branch
	test_DCWorkflow.py test_all.py test_roles.py 
Log Message:
 - Zope 2.7 is dead!  Long live Zope 2.8!


=== Products/DCWorkflow/tests/test_DCWorkflow.py 1.6 => 1.6.2.1 ===
--- Products/DCWorkflow/tests/test_DCWorkflow.py:1.6	Mon Jun 13 13:32:06 2005
+++ Products/DCWorkflow/tests/test_DCWorkflow.py	Tue Jun 14 21:20:29 2005
@@ -17,8 +17,8 @@
 
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 from Products.CMFCore.tests.base.dummy import DummyContent
 from Products.CMFCore.tests.base.dummy import DummySite
@@ -47,11 +47,7 @@
         verifyClass(IWorkflowDefinition, DCWorkflowDefinition)
 
     def test_z3interfaces(self):
-        try:
-            from zope.interface.verify import verifyClass
-        except ImportError:
-            # BBB: for Zope 2.7
-            return
+        from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import IWorkflowDefinition
         from Products.DCWorkflow.DCWorkflow import DCWorkflowDefinition
 


=== Products/DCWorkflow/tests/test_all.py 1.9 => 1.9.8.1 ===
--- Products/DCWorkflow/tests/test_all.py:1.9	Thu Aug 12 11:07:44 2004
+++ Products/DCWorkflow/tests/test_all.py	Tue Jun 14 21:20:29 2005
@@ -17,8 +17,8 @@
 
 from unittest import main
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 from Products.CMFCore.tests.base.utils import build_test_suite
 


=== Products/DCWorkflow/tests/test_roles.py 1.5 => 1.5.8.1 ===
--- Products/DCWorkflow/tests/test_roles.py:1.5	Thu Aug 12 11:07:44 2004
+++ Products/DCWorkflow/tests/test_roles.py	Tue Jun 14 21:20:29 2005
@@ -17,8 +17,8 @@
 
 import unittest
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 from OFS.Folder import Folder
 from OFS.Application import Application