Changeset 6658

Timestamp:

2 Sep 2011, 11:43:39 (13 years ago)

Author:

Henrik Bettermann

Message:

Use w.s. test case for functional tests and remove unneeded code. The 'waeup.sirp.app.applicants logger must be removed before super is called.

Call clearSite in tearDown method if setSite has been used in the setUp method.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• applicants/tests/test_root.py (modified) (3 diffs)
• browser/tests/test_permissions.py (modified) (3 diffs)
• students/tests/test_container.py (modified) (3 diffs)
• testing.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_root.py

@@ -43 +43 @@
 
 
-
-
 class FakeSite(dict):
     pass
@@ -53 +51 @@
 
     def setUp(self):
+        remove_logger('waeup.sirp.app.applicants')
         super(ApplicantsRootTestCase, self).setUp()
-        remove_logger('waeup.sirp.app.applicants')
-        self.old_loggers = get_all_loggers()
         # Setup a sample site for each test
-
         # Prepopulate the ZODB...
         app = University()
@@ -63 +59 @@
         self.app = self.getRootFolder()['app']
         setSite(self.app)
-
         self.dc_root = tempfile.mkdtemp()
         app['datacenter'].setStoragePath(self.dc_root)
-
         return
 
     def tearDown(self):
         super(ApplicantsRootTestCase, self).tearDown()
-        remove_new_loggers(self.old_loggers)
         shutil.rmtree(self.dc_root)
+        clearSite()
         return
 

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

@@ -30 +30 @@
 import shutil
 import tempfile
-from zope.app.testing.functional import FunctionalTestCase
 from zope.app.testing.functional import HTTPCaller as http
 from zope.component import createObject
@@ -77 +76 @@
     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()
@@ -104 +101 @@
         pass
 
-    #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)
+        clearSite()
         shutil.rmtree(self.dc_root)
         return

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_container.py

@@ -39 +39 @@
 
     def setUp(self):
+        remove_logger('waeup.sirp.app.students')
         super(StudentsContainerTestCase, self).setUp()
-        remove_logger('waeup.sirp.app.students')
-        self.old_loggers = get_all_loggers()
         # Setup a sample site for each test
-
         # Prepopulate the ZODB...
         app = University()
@@ -49 +47 @@
         self.app = self.getRootFolder()['app']
         setSite(self.app)
-
         self.dc_root = tempfile.mkdtemp()
         app['datacenter'].setStoragePath(self.dc_root)
@@ -56 +53 @@
     def tearDown(self):
         super(StudentsContainerTestCase, self).tearDown()
-        remove_new_loggers(self.old_loggers)
+        clearSite()
         shutil.rmtree(self.dc_root)
         return

main/waeup.sirp/trunk/src/waeup/sirp/testing.py

@@ -27 +27 @@
 
 def remove_new_loggers(old_loggers):
-    """Remove the loggers in `old_loggers`.
+    """Remove the loggers except `old_loggers`.
 
     `old_loggers` is a list of logger keys as returned by