[Checkins] SVN: GenericSetup/trunk/ - removed Zope2.startup() (all
GenericSetup tests use now ZopeTestCase.ZopeLite)
Yvo Schubbe
y.2006_ at wcm-solutions.de
Sun Jun 4 13:22:58 EDT 2006
Log message for revision 68488:
- removed Zope2.startup() (all GenericSetup tests use now ZopeTestCase.ZopeLite)
Changed:
U GenericSetup/trunk/ZCatalog/tests/test_exportimport.py
U GenericSetup/trunk/tests/test_content.py
U GenericSetup/trunk/tests/test_differ.py
U GenericSetup/trunk/tests/test_registry.py
U GenericSetup/trunk/tests/test_rolemap.py
-=-
Modified: GenericSetup/trunk/ZCatalog/tests/test_exportimport.py
===================================================================
--- GenericSetup/trunk/ZCatalog/tests/test_exportimport.py 2006-06-04 16:37:50 UTC (rev 68487)
+++ GenericSetup/trunk/ZCatalog/tests/test_exportimport.py 2006-06-04 17:22:57 UTC (rev 68488)
@@ -16,9 +16,8 @@
"""
import unittest
-import Testing
-import Zope2
-Zope2.startup()
+from Testing import ZopeTestCase
+ZopeTestCase.installProduct('ZCTextIndex', 1)
from Products.Five import zcml
from zope.component import getMultiAdapter
Modified: GenericSetup/trunk/tests/test_content.py
===================================================================
--- GenericSetup/trunk/tests/test_content.py 2006-06-04 16:37:50 UTC (rev 68487)
+++ GenericSetup/trunk/tests/test_content.py 2006-06-04 17:22:57 UTC (rev 68488)
@@ -17,8 +17,6 @@
import unittest
import Testing
-import Zope2
-Zope2.startup()
from csv import reader
from ConfigParser import ConfigParser
Modified: GenericSetup/trunk/tests/test_differ.py
===================================================================
--- GenericSetup/trunk/tests/test_differ.py 2006-06-04 16:37:50 UTC (rev 68487)
+++ GenericSetup/trunk/tests/test_differ.py 2006-06-04 17:22:57 UTC (rev 68488)
@@ -17,8 +17,6 @@
import unittest
import Testing
-import Zope2
-Zope2.startup()
from OFS.Folder import Folder
from OFS.Image import File
@@ -27,6 +25,7 @@
from common import SecurityRequestTest
+
class DummySite( Folder ):
pass
@@ -398,8 +397,8 @@
def test_suite():
return unittest.TestSuite((
- unittest.makeSuite( Test_unidiff ),
- unittest.makeSuite( ConfigDiffTests ),
+ unittest.makeSuite(Test_unidiff),
+ unittest.makeSuite(ConfigDiffTests),
))
if __name__ == '__main__':
Modified: GenericSetup/trunk/tests/test_registry.py
===================================================================
--- GenericSetup/trunk/tests/test_registry.py 2006-06-04 16:37:50 UTC (rev 68487)
+++ GenericSetup/trunk/tests/test_registry.py 2006-06-04 17:22:57 UTC (rev 68488)
@@ -17,8 +17,6 @@
import unittest
import Testing
-import Zope2
-Zope2.startup()
from OFS.Folder import Folder
from Products.GenericSetup.tests.common import BaseRegistryTests
Modified: GenericSetup/trunk/tests/test_rolemap.py
===================================================================
--- GenericSetup/trunk/tests/test_rolemap.py 2006-06-04 16:37:50 UTC (rev 68487)
+++ GenericSetup/trunk/tests/test_rolemap.py 2006-06-04 17:22:57 UTC (rev 68488)
@@ -17,8 +17,6 @@
import unittest
import Testing
-import Zope2
-Zope2.startup()
from OFS.Folder import Folder
@@ -26,6 +24,7 @@
from common import DummyExportContext
from common import DummyImportContext
+
class RolemapConfiguratorTests( BaseRegistryTests ):
def _getTargetClass( self ):
More information about the Checkins
mailing list