[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/
- made 'step_registries' a global step
Yvo Schubbe
y.2007- at wcm-solutions.de
Tue Dec 18 17:04:58 EST 2007
Log message for revision 82339:
- made 'step_registries' a global step
Changed:
U Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt
U Products.GenericSetup/trunk/Products/GenericSetup/configure.zcml
U Products.GenericSetup/trunk/Products/GenericSetup/testing.py
U Products.GenericSetup/trunk/Products/GenericSetup/tests/test_tool.py
U Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py
U Products.GenericSetup/trunk/Products/GenericSetup/tool.py
-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt 2007-12-18 20:26:37 UTC (rev 82338)
+++ Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt 2007-12-18 22:04:57 UTC (rev 82339)
@@ -2,6 +2,8 @@
GenericSetup 1.4.0 (unreleased)
+ - The 'step_registries' export step is now registered globally.
+
- Remove duplicated test (https://bugs.launchpad.net/zope-cmf/+bug/174910)
- Don't create empty 'import_steps.xml' and 'export_steps.xml' files.
Modified: Products.GenericSetup/trunk/Products/GenericSetup/configure.zcml
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/configure.zcml 2007-12-18 20:26:37 UTC (rev 82338)
+++ Products.GenericSetup/trunk/Products/GenericSetup/configure.zcml 2007-12-18 22:04:57 UTC (rev 82339)
@@ -1,6 +1,7 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- >
+ xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+ i18n_domain="genericsetup">
<include package=".browser"/>
@@ -58,4 +59,11 @@
factory=".components.ComponentRegistryXMLAdapter"
/>
+ <genericsetup:exportStep
+ name="step_registries"
+ title="Step Registries"
+ description="Export current contents of import step registry and export step registry."
+ handler="Products.GenericSetup.tool.exportStepRegistries"
+ />
+
</configure>
Modified: Products.GenericSetup/trunk/Products/GenericSetup/testing.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/testing.py 2007-12-18 20:26:37 UTC (rev 82338)
+++ Products.GenericSetup/trunk/Products/GenericSetup/testing.py 2007-12-18 22:04:57 UTC (rev 82339)
@@ -145,6 +145,7 @@
import Products.GenericSetup
zcml.load_config('meta.zcml', Products.Five)
+ zcml.load_config('meta.zcml', Products.GenericSetup)
zcml.load_config('permissions.zcml', Products.Five)
zcml.load_config('traversing.zcml', Products.Five)
zcml.load_config('configure.zcml', Products.GenericSetup)
Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_tool.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_tool.py 2007-12-18 20:26:37 UTC (rev 82338)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_tool.py 2007-12-18 22:04:57 UTC (rev 82339)
@@ -115,8 +115,7 @@
export_registry = tool.getExportStepRegistry()
export_steps = export_registry.listSteps()
- self.assertEqual( len( export_steps ), 1 )
- self.assertEqual( export_steps[ 0 ], 'step_registries' )
+ self.assertEqual(len(export_steps), 0)
toolset_registry = tool.getToolsetRegistry()
self.assertEqual( len( toolset_registry.listForbiddenTools() ), 0 )
@@ -559,18 +558,15 @@
self.assertEqual( result[ 'messages' ][ 'step_registries' ]
, None
)
- fileish = StringIO( result[ 'tarball' ] )
- self._verifyTarballContents( fileish, [ 'export_steps.xml'
- ] )
- self._verifyTarballEntryXML( fileish, 'export_steps.xml'
- , _DEFAULT_STEP_REGISTRIES_EXPORT_XML )
-
def test_runExportStep_step_registry_default(self):
site = self._makeSite()
site.setup_tool = self._makeOne('setup_tool')
tool = site.setup_tool
tool._import_registry.registerStep('foo', handler='foo.bar')
+ tool._export_registry.registerStep('step_registries',
+ 'Products.GenericSetup.tool.exportStepRegistries',
+ 'Export import / export steps.')
result = tool.runExportStep( 'step_registries' )
@@ -601,18 +597,15 @@
self.assertEqual( result[ 'messages' ][ 'step_registries' ]
, None
)
- fileish = StringIO( result[ 'tarball' ] )
- self._verifyTarballContents( fileish, [ 'export_steps.xml'
- ] )
- self._verifyTarballEntryXML( fileish, 'export_steps.xml'
- , _DEFAULT_STEP_REGISTRIES_EXPORT_XML )
-
def test_runAllExportSteps_default(self):
site = self._makeSite()
site.setup_tool = self._makeOne('setup_tool')
tool = site.setup_tool
tool._import_registry.registerStep('foo', handler='foo.bar')
+ tool._export_registry.registerStep('step_registries',
+ 'Products.GenericSetup.tool.exportStepRegistries',
+ 'Export import / export steps.')
result = tool.runAllExportSteps()
@@ -635,6 +628,9 @@
site = self._makeSite()
site.setup_tool = self._makeOne('setup_tool')
tool = site.setup_tool
+ tool._export_registry.registerStep('step_registries',
+ 'Products.GenericSetup.tool.exportStepRegistries',
+ 'Export import / export steps.')
import_reg = tool.getImportStepRegistry()
import_reg.registerStep( 'dependable', '1'
@@ -683,6 +679,9 @@
site.setup_tool = self._makeOne('setup_tool')
tool = site.setup_tool
tool._import_registry.registerStep('foo', handler='foo.bar')
+ tool._export_registry.registerStep('step_registries',
+ 'Products.GenericSetup.tool.exportStepRegistries',
+ 'Export import / export steps.')
self.assertEqual( len( tool.listSnapshotInfo() ), 0 )
Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py 2007-12-18 20:26:37 UTC (rev 82338)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_zcml.py 2007-12-18 22:04:57 UTC (rev 82339)
@@ -19,10 +19,8 @@
import Testing
from zope.testing import doctest
from zope.testing.doctest import ELLIPSIS
+from zope.testing.cleanup import cleanUp
-from Products.GenericSetup.testing import ExportImportZCMLLayer
-from Products.GenericSetup.zcml import cleanUpImportSteps
-from Products.GenericSetup.zcml import cleanUpExportSteps
from Products.GenericSetup.registry import _import_step_registry
from Products.GenericSetup.registry import _export_step_registry
from Products.Five import zcml
@@ -245,10 +243,13 @@
class ImportStepTests(unittest.TestCase):
- layer = ExportImportZCMLLayer
+ def setUp(self):
+ import Products.GenericSetup
+ zcml.load_config('meta.zcml', Products.GenericSetup)
+
def tearDown(self):
- cleanUpImportSteps()
+ cleanUp()
def testNoDependencies(self):
zcml.load_string("""<configure
@@ -291,10 +292,13 @@
class ExportStepTests(unittest.TestCase):
- layer = ExportImportZCMLLayer
+ def setUp(self):
+ import Products.GenericSetup
+ zcml.load_config('meta.zcml', Products.GenericSetup)
+
def tearDown(self):
- cleanUpExportSteps()
+ cleanUp()
def testRegistration(self):
zcml.load_string("""<configure
@@ -326,7 +330,5 @@
suite.addTest(unittest.makeSuite(ExportStepTests))
return suite
- return suite
-
if __name__ == '__main__':
unittest.main(defaultTest='test_suite')
Modified: Products.GenericSetup/trunk/Products/GenericSetup/tool.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tool.py 2007-12-18 20:26:37 UTC (rev 82338)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tool.py 2007-12-18 22:04:57 UTC (rev 82339)
@@ -179,10 +179,6 @@
self.id = str(id)
self._import_registry = ImportStepRegistry()
self._export_registry = ExportStepRegistry()
- self._export_registry.registerStep('step_registries',
- _getDottedName(exportStepRegistries),
- 'Export import / export steps.',
- )
self._toolset_registry = ToolsetRegistry()
#
More information about the Checkins
mailing list