Skip to content

Commit adb817c

Browse files
StefanRijnhartvictoralmau
authored andcommitted
[IMP] Mute logging related to checkpoint notifications in tests
``` 2020-11-05 13:36:35,202 6822 INFO openerp_test odoo.tests: skip sending email in test mode 2020-11-05 13:36:35,206 6822 INFO openerp_test odoo.addons.mail.models.mail_mail: Mail with ID 1 and Message-Id '<342741149332557.1604583395.110157728195190-openerp-1-connector.checkpoint@travis-job-14c1db44-ca6c-40e2-82ff-03dcf3df66dc>' successfully sent 2020-11-05 13:36:35,227 6822 INFO openerp_test odoo.models.unlink: User OCA#1 deleted mail.mail records with IDs: [1] 2020-11-05 13:36:35,228 6822 INFO openerp_test odoo.addons.mail.models.mail_mail: Sent batch 1 emails via mail server ID #False ```
1 parent 5931143 commit adb817c

File tree

11 files changed

+34
-18
lines changed

11 files changed

+34
-18
lines changed

Diff for: connector_magento/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
44

55
{'name': 'Magento Connector',
6-
'version': '12.0.1.1.0',
6+
'version': '12.0.1.1.2',
77
'category': 'Connector',
88
'depends': ['account',
99
'base_technical_user',

Diff for: connector_magento/i18n/connector_magento.pot

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ msgid "Already exported"
253253
msgstr ""
254254

255255
#. module: connector_magento
256-
#: code:addons/connector_magento/models/sale_order/importer.py:374
256+
#: code:addons/connector_magento/models/sale_order/importer.py:389
257257
#, python-format
258258
msgid "Already imported"
259259
msgstr ""

Diff for: connector_magento/i18n/de.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ msgid "Already exported"
283283
msgstr ""
284284

285285
#. module: connector_magento
286-
#: code:addons/connector_magento/models/sale_order/importer.py:374
286+
#: code:addons/connector_magento/models/sale_order/importer.py:389
287287
#, python-format
288288
msgid "Already imported"
289289
msgstr ""

Diff for: connector_magento/i18n/es.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ msgid "Already exported"
280280
msgstr ""
281281

282282
#. module: connector_magento
283-
#: code:addons/connector_magento/models/sale_order/importer.py:374
283+
#: code:addons/connector_magento/models/sale_order/importer.py:389
284284
#, python-format
285285
msgid "Already imported"
286286
msgstr ""

Diff for: connector_magento/i18n/fr.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ msgid "Already exported"
288288
msgstr "Déjà exporté"
289289

290290
#. module: connector_magento
291-
#: code:addons/connector_magento/models/sale_order/importer.py:374
291+
#: code:addons/connector_magento/models/sale_order/importer.py:389
292292
#, python-format
293293
msgid "Already imported"
294294
msgstr "Déjà importé"

Diff for: connector_magento/i18n/it.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ msgid "Already exported"
290290
msgstr "Già esportato"
291291

292292
#. module: connector_magento
293-
#: code:addons/connector_magento/models/sale_order/importer.py:374
293+
#: code:addons/connector_magento/models/sale_order/importer.py:389
294294
#, python-format
295295
msgid "Already imported"
296296
msgstr "Già importato"

Diff for: connector_magento/i18n/nl.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ msgid "Already exported"
283283
msgstr ""
284284

285285
#. module: connector_magento
286-
#: code:addons/connector_magento/models/sale_order/importer.py:374
286+
#: code:addons/connector_magento/models/sale_order/importer.py:389
287287
#, python-format
288288
msgid "Already imported"
289289
msgstr ""

Diff for: connector_magento/i18n/pt_BR.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ msgid "Already exported"
281281
msgstr "Já exportado"
282282

283283
#. module: connector_magento
284-
#: code:addons/connector_magento/models/sale_order/importer.py:374
284+
#: code:addons/connector_magento/models/sale_order/importer.py:389
285285
#, python-format
286286
msgid "Already imported"
287287
msgstr "Já importado"

Diff for: connector_magento/i18n/sl.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ msgid "Already exported"
281281
msgstr ""
282282

283283
#. module: connector_magento
284-
#: code:addons/connector_magento/models/sale_order/importer.py:374
284+
#: code:addons/connector_magento/models/sale_order/importer.py:389
285285
#, python-format
286286
msgid "Already imported"
287287
msgstr ""

Diff for: connector_magento/tests/common.py

+18-7
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
from contextlib import contextmanager
2121
from odoo import models
2222
from odoo.addons.component.tests.common import SavepointComponentCase
23+
from odoo.tools import mute_logger
2324

2425
from vcr import VCR
2526

@@ -160,11 +161,16 @@ def _import_record(self, model_name, magento_id, cassette=True):
160161
filename = 'import_%s_%s' % (table_name[8:], str(magento_id))
161162

162163
def run_import():
163-
if self.backend.version != '1.7':
164-
return self.env[model_name].import_record(
165-
self.backend, magento_id)
166-
with mock_urlopen_image():
167-
self.env[model_name].import_record(self.backend, magento_id)
164+
with mute_logger(
165+
'odoo.addons.mail.models.mail_mail',
166+
'odoo.models.unlink',
167+
'odoo.tests'):
168+
if self.backend.version != '1.7':
169+
return self.env[model_name].import_record(
170+
self.backend, magento_id)
171+
with mock_urlopen_image():
172+
self.env[model_name].import_record(
173+
self.backend, magento_id)
168174

169175
if cassette:
170176
with self.recorder.use_cassette(filename):
@@ -271,5 +277,10 @@ class MagentoSyncTestCase(MagentoTestCase):
271277

272278
def setUp(self):
273279
super(MagentoSyncTestCase, self).setUp()
274-
with recorder.use_cassette('metadata'):
275-
self.backend.synchronize_metadata()
280+
# Mute logging of notifications about new checkpoints
281+
with mute_logger(
282+
'odoo.addons.mail.models.mail_mail',
283+
'odoo.models.unlink',
284+
'odoo.tests'):
285+
with recorder.use_cassette('metadata'):
286+
self.backend.synchronize_metadata()

Diff for: connector_magento/tests/magento2/common.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from os.path import dirname, join
1414
from vcr import VCR
1515

16+
from odoo.tools import mute_logger
1617
from ..common import MagentoTestCase
1718

1819

@@ -38,5 +39,9 @@ def setUp(self):
3839
class Magento2SyncTestCase(Magento2TestCase):
3940
def setUp(self):
4041
super(Magento2SyncTestCase, self).setUp()
41-
with recorder.use_cassette('metadata'):
42-
self.backend.synchronize_metadata()
42+
with mute_logger(
43+
'odoo.addons.mail.models.mail_mail',
44+
'odoo.models.unlink',
45+
'odoo.tests'):
46+
with recorder.use_cassette('metadata'):
47+
self.backend.synchronize_metadata()

0 commit comments

Comments
 (0)