[CMF-checkins] CVS: CMF/CMFUid/tests - test_all.py:1.3.2.1 test_uidannotation.py:1.5.2.2 test_uidgeneration.py:1.8.2.1 test_uidhandling.py:1.8.2.2

[Tres Seaver]

Update of /cvs-repository/CMF/CMFUid/tests
In directory cvs.zope.org:/tmp/cvs-serv17354/CMFUid/tests

Modified Files:
      Tag: CMF-1_5-branch
	test_all.py test_uidannotation.py test_uidgeneration.py 
	test_uidhandling.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/CMFUid/tests/test_all.py 1.3 => 1.3.2.1 ===
--- CMF/CMFUid/tests/test_all.py:1.3	Thu Aug 12 11:07:43 2004
+++ CMF/CMFUid/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
 


=== CMF/CMFUid/tests/test_uidannotation.py 1.5.2.1 => 1.5.2.2 ===
--- CMF/CMFUid/tests/test_uidannotation.py:1.5.2.1	Fri Aug 27 04:16:22 2004
+++ CMF/CMFUid/tests/test_uidannotation.py	Fri Jul  8 08:28:31 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 Interface.Verify import verifyObject
 


=== CMF/CMFUid/tests/test_uidgeneration.py 1.8 => 1.8.2.1 ===
--- CMF/CMFUid/tests/test_uidgeneration.py:1.8	Thu Aug 12 11:07:43 2004
+++ CMF/CMFUid/tests/test_uidgeneration.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 Interface.Verify import verifyObject
 


=== CMF/CMFUid/tests/test_uidhandling.py 1.8.2.1 => 1.8.2.2 ===
--- CMF/CMFUid/tests/test_uidhandling.py:1.8.2.1	Thu Nov 18 05:38:51 2004
+++ CMF/CMFUid/tests/test_uidhandling.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 Interface.Verify import verifyObject