[FIX] tests dont log traceback on aborted request while testing

bzr revid: al@openerp.com-20140317135239-08aefkdxiil7bpcs
budisfg · Mar 17, 2014 · 627b5b6 · 627b5b6
1 parent cd4f831
commit 627b5b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/openerp/http.py b/openerp/http.py
@@ -361,15 +361,17 @@ def dispatch(self):
             response['id'] = self.jsonrequest.get('id')
             response["result"] = self._call_function(**self.params)
         except AuthenticationError, e:
-            _logger.exception("Exception during JSON request handling.")
+            _logger.exception("JSON-RPC AuthenticationError in %s.", self.httprequest.path)
             se = serialize_exception(e)
             error = {
                 'code': 100,
                 'message': "OpenERP Session Invalid",
                 'data': se
             }
         except Exception, e:
-            _logger.exception("Exception during JSON request handling.")
+            # Mute test cursor error for runbot
+            if not (openerp.tools.config['test_enable'] and isinstance(e, psycopg2.OperationalError)):
+                _logger.exception("JSON-RPC Exception in %s.", self.httprequest.path)
             se = serialize_exception(e)
             error = {
                 'code': 200,

diff --git a/openerp/tests/common.py b/openerp/tests/common.py
@@ -47,8 +47,6 @@ def acquire_test_cursor(session_id):
         cr = HTTP_SESSION.get(session_id)
         if cr:
             cr._test_lock.acquire()
-            if cr._closed:
-                werkzeug.exceptions.abort(500)
             return cr
 
 def release_test_cursor(cr):