ERP5Type: xxx wip on publish

product/ERP5Type/tests/ERP5TypeTestCase.py

@@ -601,17 +601,30 @@ class ERP5TypeTestCaseMixin(ProcessingNodeTestCase, PortalTestCase):
 
     def publish(self, path, basic=None, env=None, extra=None,
                 request_method='GET', stdin=None, handle_errors=True):
-        '''Publishes the object at 'path' returning a response object.'''
+        '''Publishes the object at 'path' returning a response object.
+        
+        This was copied from Zope.Testing.ZopeTestCase.functional and adjusted to:
+          * fix a problem with some passwords ( d8e87e7ab922cab4486a715e0a8ed2530c696cae )
+          * set HTTP_ACCEPT_CHARSET
+          * support live tests hacks
+        '''
 
         from ZPublisher.Response import Response
         from ZPublisher.Test import publish_module
 
         from AccessControl.SecurityManagement import getSecurityManager
         from AccessControl.SecurityManagement import setSecurityManager
+        from zope.security.management import endInteraction
+        from zope.security.management import restoreInteraction
+        
+        request = self.app.REQUEST
 
         # Save current security manager
         sm = getSecurityManager()
+        #endInteraction()
+        _module_cache_set = getattr(request, '_module_cache_set', None)
 
+        try:
           # Commit the sandbox for good measure
           self.commit()
 
@@ -620,8 +633,6 @@ class ERP5TypeTestCaseMixin(ProcessingNodeTestCase, PortalTestCase):
           if extra is None:
             extra = {}
 
-        request = self.app.REQUEST
-
           env['SERVER_NAME'] = request['SERVER_NAME']
           env['SERVER_PORT'] = request['SERVER_PORT']
           env['HTTP_ACCEPT_CHARSET'] = request['HTTP_ACCEPT_CHARSET']
@@ -652,10 +663,15 @@ class ERP5TypeTestCaseMixin(ProcessingNodeTestCase, PortalTestCase):
                          debug=not handle_errors,
                         )
 
+          return ResponseWrapper(response, outstream, path)
+        finally:
           # Restore security manager
           setSecurityManager(sm)
+          #restoreInteraction()
+          if _module_cache_set is not None:
+            print "bah ouais", _module_cache_set
+            request._module_cache_set = _module_cache_set
 
-        return ResponseWrapper(response, outstream, path)
 
     def getConsistencyMessageList(self, obj):
         return sorted([ str(message.getMessage())