[CMF-checkins] SVN: CMF/trunk/ - more test cleanup
Yvo Schubbe
y.2007- at wcm-solutions.de
Thu Mar 8 03:49:50 EST 2007
Log message for revision 73056:
- more test cleanup
Changed:
U CMF/trunk/CMFCore/tests/test_CachingPolicyManager.py
U CMF/trunk/CMFCore/tests/test_SkinsTool.py
U CMF/trunk/DCWorkflow/tests/test_DCWorkflow.py
-=-
Modified: CMF/trunk/CMFCore/tests/test_CachingPolicyManager.py
===================================================================
--- CMF/trunk/CMFCore/tests/test_CachingPolicyManager.py 2007-03-08 08:03:18 UTC (rev 73055)
+++ CMF/trunk/CMFCore/tests/test_CachingPolicyManager.py 2007-03-08 08:49:49 UTC (rev 73056)
@@ -27,8 +27,6 @@
from App.Common import rfc1123_date
from DateTime.DateTime import DateTime
from OFS.Cache import Cacheable
-
-from zope.app.component.hooks import setHooks
from zope.component import getSiteManager
from Products.CMFCore.FSPageTemplate import FSPageTemplate
Modified: CMF/trunk/CMFCore/tests/test_SkinsTool.py
===================================================================
--- CMF/trunk/CMFCore/tests/test_SkinsTool.py 2007-03-08 08:03:18 UTC (rev 73055)
+++ CMF/trunk/CMFCore/tests/test_SkinsTool.py 2007-03-08 08:49:49 UTC (rev 73056)
@@ -19,6 +19,7 @@
import Testing
from zope.component import getSiteManager
+from zope.testing.cleanup import cleanUp
from Products.CMFCore.interfaces import ISkinsTool
@@ -108,6 +109,11 @@
return TestSkinnableObjectManager()
+ def tearDown(self):
+ from Products.CMFCore.Skinnable import SKINDATA
+ SKINDATA.clear()
+ cleanUp()
+
def test_getCurrentSkinName(self):
som = self._makeOne()
Modified: CMF/trunk/DCWorkflow/tests/test_DCWorkflow.py
===================================================================
--- CMF/trunk/DCWorkflow/tests/test_DCWorkflow.py 2007-03-08 08:03:18 UTC (rev 73055)
+++ CMF/trunk/DCWorkflow/tests/test_DCWorkflow.py 2007-03-08 08:49:49 UTC (rev 73056)
@@ -18,20 +18,21 @@
import unittest
import Testing
-from Products.CMFCore.testing import TraversingZCMLLayer
+from zope.component import adapter
+from zope.component import provideHandler
+
+from Products.CMFCore.testing import TraversingEventZCMLLayer
from Products.CMFCore.tests.base.dummy import DummyContent
from Products.CMFCore.tests.base.dummy import DummySite
from Products.CMFCore.tests.base.dummy import DummyTool
from Products.CMFCore.WorkflowTool import WorkflowTool
-
-from zope.interface import Interface
-from zope.component import provideHandler, adapter
from Products.DCWorkflow.interfaces import IBeforeTransitionEvent
from Products.DCWorkflow.interfaces import IAfterTransitionEvent
+
class DCWorkflowDefinitionTests(unittest.TestCase):
- layer = TraversingZCMLLayer
+ layer = TraversingEventZCMLLayer
def setUp(self):
self.site = DummySite('site')
@@ -194,4 +195,5 @@
))
if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ from Products.CMFCore.testing import run
+ run(test_suite())
More information about the CMF-checkins
mailing list