[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_tool.py - made tests more robust (the order might change)

[Yvo Schubbe]

Log message for revision 82388:
  - made tests more robust (the order might change)

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/tests/test_tool.py

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_tool.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_tool.py	2007-12-21 17:02:48 UTC (rev 82387)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_tool.py	2007-12-22 09:11:48 UTC (rev 82388)
@@ -904,30 +904,47 @@
         site = self._makeSite()
         site.setup_tool = self._makeOne('setup_tool')
         tool = site.setup_tool
-        self.assertEqual(tool.listExportSteps(),
-                         (u'toolset', u'step_registries', u'rolemap',
-                          u'componentregistry'))
+        result = tool.listExportSteps()
+        self.assertEqual(len(result), 4)
+        self.failUnless(u'componentregistry' in result)
+        self.failUnless(u'rolemap' in result)
+        self.failUnless(u'step_registries' in result)
+        self.failUnless(u'toolset' in result)
 
         tool._export_registry.registerStep(u'foo', handler='foo.export')
         tool._export_registry.registerStep(u'toolset',
                                            handler='toolset.export')
-        self.assertEqual(tool.listExportSteps(),
-                         (u'toolset', u'foo', u'step_registries', u'rolemap',
-                          u'componentregistry'))
+        result = tool.listExportSteps()
+        self.assertEqual(len(result), 5)
+        self.failUnless(u'componentregistry' in result)
+        self.failUnless(u'foo' in result)
+        self.failUnless(u'rolemap' in result)
+        self.failUnless(u'step_registries' in result)
+        self.failUnless(u'toolset' in result)
 
     def test_getSortedImportSteps(self):
         site = self._makeSite()
         site.setup_tool = self._makeOne('setup_tool')
         tool = site.setup_tool
-        self.assertEqual(tool.getSortedImportSteps(),
-                         (u'rolemap', u'toolset', u'componentregistry'))
+        result = tool.getSortedImportSteps()
+        self.assertEqual(len(result), 3)
+        self.failUnless(u'componentregistry' in result)
+        self.failUnless(u'rolemap' in result)
+        self.failUnless(u'toolset' in result)
+        self.failUnless(list(result).index(u'componentregistry') >
+                        list(result).index(u'toolset'))
 
         tool._import_registry.registerStep(u'foo', handler='foo.import')
         tool._import_registry.registerStep(u'toolset',
                                            handler='toolset.import')
-        self.assertEqual(tool.getSortedImportSteps(),
-                         (u'rolemap', u'foo', u'toolset',
-                          u'componentregistry'))
+        result = tool.getSortedImportSteps()
+        self.assertEqual(len(result), 4)
+        self.failUnless(u'componentregistry' in result)
+        self.failUnless(u'foo' in result)
+        self.failUnless(u'rolemap' in result)
+        self.failUnless(u'toolset' in result)
+        self.failUnless(list(result).index(u'componentregistry') >
+                        list(result).index(u'toolset'))
 
 
 _DEFAULT_STEP_REGISTRIES_EXPORT_XML = """\