From 9c16f38fd5f1e0b5fc4bca639bea44408fbd4aca Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Sun, 16 Jan 2022 06:34:05 +0000 Subject: [PATCH] [FIX] microsoft_calendar: use recent dates Test was failing since 2022-01-16, probably a max 2 years sync FAIL: TestSyncOdoo2Microsoft.test_restart_synchronization Traceback (most recent call last): File "/usr/lib/python3.8/unittest/mock.py", line 1325, in patched return func(*newargs, **newkeywargs) File "/data/build/odoo/addons/microsoft_calendar/tests/test_sync_odoo2microsoft.py", line 21, in patched return func(self, *args, **kwargs) File "/data/build/odoo/addons/microsoft_calendar/tests/test_sync_odoo2microsoft.py", line 84, in test_restart_synchronization self.assertMicrosoftEventPatched(event.microsoft_id, { File "/data/build/odoo/addons/microsoft_calendar/tests/test_sync_odoo2microsoft.py", line 40, in assertMicrosoftEventPatched MicrosoftSync._microsoft_patch.assert_called_once() File "/usr/lib/python3.8/unittest/mock.py", line 892, in assert_called_once raise AssertionError(msg) AssertionError: Expected 'mock' to have been called once. Called 0 times. Calls: [call._constrains(calendar.event(2049,)), call._constrains().__iter__(), call._constrains().__len__()]. closes odoo/odoo#82849 X-original-commit: 86911c4e9b9f86f3b9a5625b973e78103a7b0286 Signed-off-by: Martin Trigaux (mat) --- .../tests/test_sync_odoo2microsoft.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/microsoft_calendar/tests/test_sync_odoo2microsoft.py b/addons/microsoft_calendar/tests/test_sync_odoo2microsoft.py index c1d552af424..4f5a7b60115 100644 --- a/addons/microsoft_calendar/tests/test_sync_odoo2microsoft.py +++ b/addons/microsoft_calendar/tests/test_sync_odoo2microsoft.py @@ -47,12 +47,13 @@ class TestSyncOdoo2Microsoft(TransactionCase): self.env.user.stop_microsoft_synchronization() self.assertTrue(self.env.user.microsoft_synchronization_stopped, "The microsoft synchronization flag should be switched on") self.assertFalse(self.env.user._sync_microsoft_calendar(self.microsoft_service), "The microsoft synchronization should be stopped") + year = date.today().year - 1 # If synchronization stopped, creating a new event should not call _google_insert. self.env['calendar.event'].create({ 'name': "Event", - 'start': datetime(2020, 1, 15, 8, 0), - 'stop': datetime(2020, 1, 15, 18, 0), + 'start': datetime(year, 1, 15, 8, 0), + 'stop': datetime(year, 1, 15, 18, 0), 'privacy': 'private', }) self.assertMicrosoftEventNotInserted() @@ -62,6 +63,7 @@ class TestSyncOdoo2Microsoft(TransactionCase): # Test new event created after stopping synchronization are correctly patched when restarting sync. self.maxDiff = None microsoft_id = 'aaaaaaaaa' + year = date.today().year partner = self.env['res.partner'].create({'name': 'Jean-Luc', 'email': 'jean-luc@opoo.com'}) user = self.env['res.users'].create({ 'name': 'Test user Calendar', @@ -73,8 +75,8 @@ class TestSyncOdoo2Microsoft(TransactionCase): event = self.env['calendar.event'].with_user(user).create({ 'microsoft_id': microsoft_id, 'name': "Event", - 'start': datetime(2021, 1, 15, 8, 0), - 'stop': datetime(2021, 1, 15, 18, 0), + 'start': datetime(year, 1, 15, 8, 0), + 'stop': datetime(year, 1, 15, 18, 0), 'partner_ids': [(4, partner.id)], }) @@ -83,8 +85,8 @@ class TestSyncOdoo2Microsoft(TransactionCase): microsoft_guid = self.env['ir.config_parameter'].sudo().get_param('microsoft_calendar.microsoft_guid', False) self.assertMicrosoftEventPatched(event.microsoft_id, { 'id': event.microsoft_id, - 'start': {'dateTime': '2021-01-15T08:00:00+00:00', 'timeZone': 'Europe/London'}, - 'end': {'dateTime': '2021-01-15T18:00:00+00:00', 'timeZone': 'Europe/London'}, + 'start': {'dateTime': '%s-01-15T08:00:00+00:00' % year, 'timeZone': 'Europe/London'}, + 'end': {'dateTime': '%s-01-15T18:00:00+00:00' % year, 'timeZone': 'Europe/London'}, 'subject': 'Event', 'body': {'content': '', 'contentType': 'text'}, 'attendees': [],