[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/tests/ - fixed test

[Yvo Schubbe]

Log message for revision 120220:
  - fixed test

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py
  U   Products.CMFCore/trunk/Products/CMFCore/tests/test_DirectoryView.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py	2011-02-08 16:15:09 UTC (rev 120219)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py	2011-02-08 16:35:34 UTC (rev 120220)
@@ -6,6 +6,7 @@
 import time
 import logging
 from os import chmod, curdir, mkdir, remove, stat, walk
+from os import rmdir
 from os.path import abspath
 from os.path import basename
 from os.path import dirname
@@ -194,6 +195,13 @@
         if use_dir_mtime:
             self._addedOrRemoved(dir_mtime)
 
+    def _deleteDirectory(self, subdirname, use_dir_mtime=False):
+        if use_dir_mtime:
+            dir_mtime = stat(self.skin_path_name).st_mtime
+        rmdir(join(self.skin_path_name, subdirname))
+        if use_dir_mtime:
+            self._addedOrRemoved(dir_mtime)
+
     def _addedOrRemoved(self, old_mtime):
         # Called after adding/removing a file from self.skin_path_name.
 

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_DirectoryView.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_DirectoryView.py	2011-02-08 16:15:09 UTC (rev 120219)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_DirectoryView.py	2011-02-08 16:35:34 UTC (rev 120220)
@@ -17,7 +17,8 @@
 import Testing
 
 import sys
-from os import remove, mkdir, rmdir
+from os import mkdir
+from os import remove
 from os.path import join
 from tempfile import mktemp
 
@@ -303,7 +304,7 @@
     def test_DeleteFolder(self):
         # Make sure a deleted folder goes away
         self.failUnless(hasattr(self.ob.fake_skin, 'test_directory'))
-        rmdir(self.testdpath)
+        self._deleteDirectory('test_directory')
         self.failIf(hasattr(self.ob.fake_skin, 'test_directory'))