[CMF-checkins] SVN: CMF/branches/1.6/CMFCore/tests/base/testcase.py - hardened fake_skins tearDown

Yvo Schubbe y.2006_ at wcm-solutions.de
Fri Apr 28 06:17:46 EDT 2006


Log message for revision 67704:
  - hardened fake_skins tearDown

Changed:
  U   CMF/branches/1.6/CMFCore/tests/base/testcase.py

-=-
Modified: CMF/branches/1.6/CMFCore/tests/base/testcase.py
===================================================================
--- CMF/branches/1.6/CMFCore/tests/base/testcase.py	2006-04-28 10:17:39 UTC (rev 67703)
+++ CMF/branches/1.6/CMFCore/tests/base/testcase.py	2006-04-28 10:17:45 UTC (rev 67704)
@@ -38,7 +38,7 @@
 
   <adapter
       for="*"
-      factory=".traversable.FiveTraversable"
+      factory="Products.Five.traversable.FiveTraversable"
       provides="zope.app.traversing.interfaces.ITraversable"
       />
 
@@ -262,6 +262,11 @@
         self.skin_path_name = join(self.tempname,self._skinname,self._layername)
 
     def tearDown(self):
+        self._free_warning_output()
         # kill the copy
-        self._free_warning_output()
-        rmtree(self.tempname)
+        try:
+            rmtree(self.tempname)
+        except OSError:
+            # try again (some files might be locked temporarily)
+            time.sleep(0.1)
+            rmtree(self.tempname)



More information about the CMF-checkins mailing list