Merge PR #407 into 16.0

Signed-off-by sbidoul
OCA · Dec 21, 2023 · dfcd19d · dfcd19d
2 parents a033014 + a9088c2
commit dfcd19d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/fastapi/error_handlers.py b/fastapi/error_handlers.py
@@ -23,15 +23,10 @@
 
 
 def _rollback(request: Request, reason: str) -> None:
-    env = odoo_env_ctx.get()
-    cr = env.cr
+    cr = odoo_env_ctx.get().cr
     if cr is not None:
         _logger.debug("rollback on %s", reason)
         cr.rollback()
-        # Also close the cursor, so `retrying` in service/model.py does not attempt to
-        # flush.
-        if not (env.registry.in_test_mode()):
-            cr.close()
 
 
 async def _odoo_user_error_handler(

diff --git a/fastapi/tests/test_fastapi_demo.py b/fastapi/tests/test_fastapi_demo.py
@@ -47,9 +47,7 @@ def assert_exception_processed(
             demo_app._get_app(), raise_server_exceptions=False
         ) as test_client, mock.patch.object(
             self.env.cr.__class__, "rollback"
-        ) as mock_rollback, mock.patch.object(
-            self.env.cr.__class__, "close"
-        ) as mock_close:
+        ) as mock_rollback:
             response: Response = test_client.get(
                 "/demo/exception",
                 params={
@@ -58,7 +56,6 @@ def assert_exception_processed(
                 },
             )
             mock_rollback.assert_called_once()
-            mock_close.assert_called_once()
         self.assertEqual(response.status_code, expected_status_code)
         self.assertDictEqual(
             response.json(),