[CMF-checkins] CVS: CMF/CMFSetup/tests - test_all.py:1.12 test_tool.py:1.12

[Tres Seaver]

Update of /cvs-repository/CMF/CMFSetup/tests
In directory cvs.zope.org:/tmp/cvs-serv2866/tests

Modified Files:
	test_all.py test_tool.py 
Log Message:


  - README.txt

    o Update punch list.

  - registry.py:

    o Sort tool lists for CVS friendliness.

  - tool.py:

    o Fix buglet in exportToolset.

  - profiles/default/import_steps.xml:

    o Fix ID clash.

  - tests/test_all.py:

    o Janitorial.


=== CMF/CMFSetup/tests/test_all.py 1.11 => 1.12 ===
--- CMF/CMFSetup/tests/test_all.py:1.11	Wed Jun 30 14:13:00 2004
+++ CMF/CMFSetup/tests/test_all.py	Wed Jun 30 14:58:51 2004
@@ -19,7 +19,6 @@
                              , 'test_rolemap'
                              , 'test_skins'
                              , 'test_tool'
-                           # , 'test_toolset'
                              , 'test_typeinfo'
                              , 'test_utils'
                              , 'test_workflow'


=== CMF/CMFSetup/tests/test_tool.py 1.11 => 1.12 ===
--- CMF/CMFSetup/tests/test_tool.py:1.11	Wed Jun 30 14:13:00 2004
+++ CMF/CMFSetup/tests/test_tool.py	Wed Jun 30 14:58:51 2004
@@ -785,7 +785,7 @@
         self.assertEqual( len( context._wrote ), 1 )
         filename, text, content_type = context._wrote[ 0 ]
         self.assertEqual( filename, TOOLSET_XML )
-        self._compareDOM( text, _EMPTY_TOOLSET_XML )
+        self._compareDOM( text, _NORMAL_TOOLSET_XML )
         self.assertEqual( content_type, 'text/xml' )
 
 class Test_importToolset( _ToolsetSetup ):
@@ -906,6 +906,15 @@
 _EMPTY_TOOLSET_XML = """\
 <?xml version="1.0"?>
 <tool-setup>
+</tool-setup>
+"""
+
+_NORMAL_TOOLSET_XML = """\
+<?xml version="1.0" ?>
+<tool-setup>
+<forbidden tool_id="doomed"/>
+<required class="path.to.one" tool_id="mandatory"/>
+<required class="path.to.another" tool_id="obligatory"/>
 </tool-setup>
 """