Fix tests

Author: florentx

odooly.py

@@ -612,7 +612,7 @@ def _req(self, url, json, headers, method):
     def _check(self, uid=None):
         url = urljoin(self._server, f'{self._endpoint}/res.users/context_get')
         try:
-            context = self._http.request(url, json={}, headers=self._headers, method='POST')
+            context = self._http.request(url, json={}, headers=self._headers)
         except (OSError, ServerError):
             return False
         return self if (not uid or uid == context['uid']) else False

tests/test_client.py

@@ -314,14 +314,15 @@ class TestSampleSession(XmlRpcTestCase):
 
     def test_simple(self):
         self.service.object.execute_kw.side_effect = [
-            4, 71, [{'model': 'ir.cron'}], sentinel.IDS, sentinel.CRON]
+            4, True, 71, [{'model': 'ir.cron'}], sentinel.IDS, sentinel.CRON]
 
         res_users = self.env['res.users']
         self.assertEqual(res_users.search_count(), 4)
         self.assertEqual(self.env['ir.cron'].read(
             ['active = False'], 'active function'), sentinel.CRON)
         self.assertCalls(
             OBJ('res.users', 'search_count', []),
+            OBJ('ir.model.access', 'check', 'ir.model', 'read'),
             OBJ('ir.model', 'search', [('model', 'like', 'ir.cron')]),
             OBJ('ir.model', 'read', 71, ('model',)),
             OBJ('ir.cron', 'search', [('active', '=', False)]),
@@ -481,23 +482,23 @@ def test_model(self):
 
         if float(self.server_version) < 8.0:
             expected_calls = [
+                OBJ('ir.model.access', 'check', 'ir.model', 'read'),
                 OBJ('ir.model', 'search', [('model', 'like', 'foo.bar')]),
                 OBJ('ir.model', 'read', [ID2, ID1], ('model',)),
             ]
-            side_effect = [[ID2, ID1], [{'id': 13, 'model': 'foo.bar'}]]
+            side_effect = [True, [ID2, ID1], [{'id': 13, 'model': 'foo.bar'}]]
         else:
             expected_calls = [
+                OBJ('ir.model.access', 'check', 'ir.model', 'read'),
                 OBJ('ir.model', 'search_read', [('model', 'like', 'foo.bar')], ('model',)),
             ]
-            side_effect = [[{'id': 13, 'model': 'foo.bar'}]]
+            side_effect = [True, [{'id': 13, 'model': 'foo.bar'}]]
 
         self.assertTrue(self.env.models('foo.bar'))
-        self.assertCalls(*expected_calls)
-        self.assertOutput('')
+        self.assertCalls(*expected_calls[1:])
 
         self.assertRaises(odooly.Error, self.env.__getitem__, 'foo.bar')
         self.assertCalls(*expected_calls)
-        self.assertOutput('')
 
         self.service.object.execute_kw.side_effect = side_effect
         self.assertIsInstance(self.env['foo.bar'], odooly.Model)

tests/test_interact.py

@@ -117,7 +117,7 @@ def test_invalid_user_password(self):
         mock.patch('odooly.getpass', return_value='x').start()
         self.service.db.list.return_value = ['database']
         self.service.common.login.side_effect = [17, None]
-        self.service.object.execute_kw.side_effect = [{}, 42, {}, 42, {}, 42]
+        self.service.object.execute_kw.side_effect = [{}, True, 42, {}, True, 42, {}, 42]
 
         # Launch interactive
         self.infunc.side_effect = [
@@ -133,10 +133,12 @@ def usr17(model, method, *params):
         expected_calls = self.startup_calls + (
             ('common.login', 'database', 'usr', 'passwd'),
             ('object.execute_kw', 'database', 17, 'passwd', 'res.users', 'context_get', ()),
+            ('object.execute_kw', 'database', 17, 'passwd', 'ir.model.access', 'check', ('ir.model', 'read')),
             usr17('ir.model', 'search',
                   [('model', 'like', 'res.company')]),
             usr17('ir.model', 'read', 42, ('model',)),
             ('common.login', 'database', 'gaspard', 'x'),
+            ('object.execute_kw', 'database', 17, 'passwd', 'ir.model.access', 'check', ('ir.model', 'read')),
             usr17('ir.model', 'search',
                   [('model', 'like', 'res.company')]),
             usr17('ir.model', 'read', 42, ('model',)),

tests/test_model.py

@@ -128,10 +128,11 @@ def test_model(self):
         self.assertRaises(odooly.Error, self.env.__getitem__, 'mic.mac')
         self.assertRaises(AttributeError, getattr, self.client, 'MicMac')
         expected_calls = [
+            OBJ('ir.model.access', 'check', 'ir.model', 'read'),
             OBJ('ir.model', 'search_read', [('model', 'like', 'mic.mac')], ('model',)),
         ]
         if float(self.server_version) < 8.0:
-            expected_calls = [
+            expected_calls[1:] = [
                 OBJ('ir.model', 'search', [('model', 'like', 'mic.mac')]),
                 OBJ('ir.model', 'read', ANY, ('model',)),
             ]
@@ -143,10 +144,11 @@ def test_model(self):
         self.assertEqual(self.env['foo.bar']._name, 'foo.bar')
 
         expected_calls = [
+            OBJ('ir.model.access', 'check', 'ir.model', 'read'),
             OBJ('ir.model', 'search_read', [('model', 'like', 'foo.bar')], ('model',)),
         ]
         if float(self.server_version) < 8.0:
-            expected_calls = [
+            expected_calls[1:] = [
                 OBJ('ir.model', 'search', [('model', 'like', 'foo.bar')]),
                 OBJ('ir.model', 'read', [777], ('model',)),
             ]