Fix unit test.

tests/test_xbus_emitter.py

@@ -24,6 +24,7 @@
 from .util.uuidgen import genUuid
 
 import mock  # Odoo req.
+from unittest.mock import create_autospec
 
 # Save this method so we can wrap it in a mock.
 prev_sql_execute = odoo.sql_db.Cursor.execute
@@ -33,9 +34,7 @@
 @odoo.tests.common.post_install(True)
 class Test(TestBase):
 
-    @mock.patch.object(odoo.sql_db.Cursor, 'execute', autospec=True,
-                       side_effect=prev_sql_execute)
-    def test_0000_create_xbus_emitter_job(self, sql_execute_mock):
+    def test_0000_create_xbus_emitter_job(self):
         """Basic job creation test using public methods provided by this
         module.
         """
@@ -39,4 +38,11 @@
         """Basic job creation test using public methods provided by this
         module.
         """
+        with mock.patch.object(
+            self.env.cr, 'execute', autospec=True,
+            side_effect=self.env.cr.execute
+        ):
+            # Use the default emitter loaded by this module.
+            emitter = self.env['xbus.emitter'].search([], limit=1)
+            self.assertTrue(emitter)
 
@@ -42,8 +48,4 @@
 
-        # Use the default emitter loaded by this module.
-        emitter = self.env['xbus.emitter'].search([], limit=1)
-        self.assertTrue(emitter)
-
-        EVENT_TYPE = genUuid()
-        DATA = {'foo': 'bar'}
+            EVENT_TYPE = genUuid()
+            DATA = {'foo': 'bar'}
 
@@ -49,8 +51,8 @@
 
-        job = emitter.send_items(EVENT_TYPE, DATA)
-        self.assertTrue(job)
-        self.assertEqual(job.event_type, EVENT_TYPE)
-        self.assertFalse(job.log)  # Not processed yet.
-        self.assertEqual(job.items, '{"foo": "bar"}')  # JSON-ified
-        self.assertEqual(job.state, 'to_send')
+            job = emitter.send_items(EVENT_TYPE, DATA)
+            self.assertTrue(job)
+            self.assertEqual(job.event_type, EVENT_TYPE)
+            self.assertFalse(job.log)  # Not processed yet.
+            self.assertEqual(job.items, '{"foo": "bar"}')  # JSON-ified
+            self.assertEqual(job.state, 'to_send')
 
@@ -56,6 +58,5 @@
 
-        # Ensure a "NOTIFY" postgresql command has been sent.
-        sql_execute_mock.assert_any_call(
-            self.env.cr,
-            "NOTIFY xbus_emitter_job, '%s'" % job.id,
-        )
+            # Ensure a "NOTIFY" postgresql command has been sent.
+            self.env.cr.execute.assert_any_call(
+                "NOTIFY xbus_emitter_job, '%s'" % emitter.id,
+            )