Changeset 6645

Timestamp:

28 Aug 2011, 20:08:09 (13 years ago)

Author:

Henrik Bettermann

Message:

Make tests work (failure in test test_storage_move). I don't know if this is really the best solution. Uli, please check.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/browser/tests/test_permissions.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/tests/test_permissions.py

@@ -33 +33 @@
 from zope.app.testing.functional import HTTPCaller as http
 from zope.component import createObject
-from zope.component.hooks import setSite
+from zope.component.hooks import setSite, clearSite
 from zope.security.interfaces import Unauthorized
 from zope.testbrowser.testing import Browser
-from waeup.sirp.testing import FunctionalLayer
 from waeup.sirp.app import University
+from waeup.sirp.testing import (
+    FunctionalLayer, FunctionalTestCase, get_all_loggers, remove_new_loggers,
+    remove_logger)
 
 manager_pages = [
@@ -75 +77 @@
     def setUp(self):
         super(PermissionTest, self).setUp()
-
+        #remove_logger('waeup.sirp.app')
+        self.old_loggers = get_all_loggers()
         # Set up a complete university to have every page available...
         app = University()
@@ -101 +104 @@
         pass
 
-    def cleanUp(self):
-        super(ManagerTest, self).cleanUp()
+    #def cleanUp(self):
+    #    super(PermissionTest, self).cleanUp()
+    #    clearSite()
+    #    shutil.rmtree(self.dc_root)
+
+    def tearDown(self):
+        super(PermissionTest, self).tearDown()
+        remove_new_loggers(self.old_loggers)
         shutil.rmtree(self.dc_root)
+        return
 
     def isAccessible(self, path):