diff options
| author | Julien Castiaux <juc@odoo.com> | 2019-09-11 09:45:31 +0000 |
|---|---|---|
| committer | Julien Castiaux <juc@odoo.com> | 2019-09-17 11:36:42 +0000 |
| commit | 4f03a5f136ab928ae74322bf1c34a1b6a6baf979 (patch) | |
| tree | e0e0c0653888751c165b9ffb269d3b70853badef /odoo/addons/test_assetsbundle | |
| parent | 6c948c36bbf72dd896e0bff03aa7fbddadcbb0cd (diff) | |
[FIX] *: remove old deprecated modules/functions
PEP-594 is deprecating a bunch of modules. As part of the cleanup, we
are also dealing with long deprecated modules, functions and aliases.
* `assert_` -> `assertTrue`
* `assertEquals` -> `assertEqual`
* `assertNotEquals` -> `assertNotEqual`
* `assertAlmostEquals` -> `assertAlmostEqual`
* `assertRaisesRegexp` -> `assertRaisesRegex`
* `assertRegexpMatches` -> `assertRegex`
* `base64.encodestring` -> `base64.encodebytes`
* `base64.decodestring` -> `base64.decodebytes`
* `inspect.getargspec` -> `inspect.signature`
* `inspect.formatargspec` -> `inspect.signature`
* `logging.warn` -> `logging.warning`
closes odoo/odoo#36863
Task: 2003936
Signed-off-by: Raphael Collet (rco) <rco@openerp.com>
Diffstat (limited to 'odoo/addons/test_assetsbundle')
| -rw-r--r-- | odoo/addons/test_assetsbundle/tests/test_assetsbundle.py | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/odoo/addons/test_assetsbundle/tests/test_assetsbundle.py b/odoo/addons/test_assetsbundle/tests/test_assetsbundle.py index 6e74fb0fc99..557b1396a04 100644 --- a/odoo/addons/test_assetsbundle/tests/test_assetsbundle.py +++ b/odoo/addons/test_assetsbundle/tests/test_assetsbundle.py @@ -64,15 +64,15 @@ class TestJavascriptAssetsBundle(FileTouchable): self.bundle = self._get_asset(self.jsbundle_xmlid, env=self.env) # there shouldn't be any attachment associated to this bundle - self.assertEquals(len(self._any_ira_for_bundle('js')), 0) - self.assertEquals(len(self.bundle.get_attachments('js')), 0) + self.assertEqual(len(self._any_ira_for_bundle('js')), 0) + self.assertEqual(len(self.bundle.get_attachments('js')), 0) # trigger the first generation and, thus, the first save in database self.bundle.js() # there should be one attachment associated to this bundle - self.assertEquals(len(self._any_ira_for_bundle('js')), 1) - self.assertEquals(len(self.bundle.get_attachments('js')), 1) + self.assertEqual(len(self._any_ira_for_bundle('js')), 1) + self.assertEqual(len(self.bundle.get_attachments('js')), 1) def test_02_access(self): """ Checks that the bundle's cache is working, i.e. that the bundle creates only one @@ -81,7 +81,7 @@ class TestJavascriptAssetsBundle(FileTouchable): bundle0 = self._get_asset(self.jsbundle_xmlid) bundle0.js() - self.assertEquals(len(self._any_ira_for_bundle('js')), 1) + self.assertEqual(len(self._any_ira_for_bundle('js')), 1) version0 = bundle0.version ira0 = self._any_ira_for_bundle('js') @@ -90,14 +90,14 @@ class TestJavascriptAssetsBundle(FileTouchable): bundle1 = self._get_asset(self.jsbundle_xmlid) bundle1.js() - self.assertEquals(len(self._any_ira_for_bundle('js')), 1) + self.assertEqual(len(self._any_ira_for_bundle('js')), 1) version1 = bundle1.version ira1 = self._any_ira_for_bundle('js') date1 = ira1.create_date - self.assertEquals(version0, version1) - self.assertEquals(date0, date1) + self.assertEqual(version0, version1) + self.assertEqual(date0, date1) def test_03_date_invalidation(self): """ Checks that a bundle is invalidated when one of its assets' modification date is changed. @@ -114,11 +114,11 @@ class TestJavascriptAssetsBundle(FileTouchable): bundle1.js() last_modified1 = bundle1.last_modified version1 = bundle1.version - self.assertNotEquals(last_modified0, last_modified1) - self.assertNotEquals(version0, version1) + self.assertNotEqual(last_modified0, last_modified1) + self.assertNotEqual(version0, version1) # check if the previous attachment is correctly cleaned - self.assertEquals(len(self._any_ira_for_bundle('js')), 1) + self.assertEqual(len(self._any_ira_for_bundle('js')), 1) def test_04_content_invalidation(self): """ Checks that a bundle is invalidated when its content is modified by adding a file to @@ -129,7 +129,7 @@ class TestJavascriptAssetsBundle(FileTouchable): files0 = bundle0.files version0 = bundle0.version - self.assertEquals(len(self._any_ira_for_bundle('js')), 1) + self.assertEqual(len(self._any_ira_for_bundle('js')), 1) view_arch = """ <data> @@ -151,11 +151,11 @@ class TestJavascriptAssetsBundle(FileTouchable): files1 = bundle1.files version1 = bundle1.version - self.assertNotEquals(files0, files1) - self.assertNotEquals(version0, version1) + self.assertNotEqual(files0, files1) + self.assertNotEqual(version0, version1) # check if the previous attachment are correctly cleaned - self.assertEquals(len(self._any_ira_for_bundle('js')), 1) + self.assertEqual(len(self._any_ira_for_bundle('js')), 1) def test_05_debug(self): """ Checks that a bundle rendered in debug mode outputs non-minified assets. @@ -167,14 +167,14 @@ class TestJavascriptAssetsBundle(FileTouchable): self.assertIn('/test_assetsbundle/static/src/js/test_jsfile1.js', content) # there shouldn't be any assets created in debug mode - self.assertEquals(len(self._any_ira_for_bundle('js')), 0) + self.assertEqual(len(self._any_ira_for_bundle('js')), 0) def test_08_css_generation3(self): # self.cssbundle_xlmid contains 3 rules self.bundle = self._get_asset(self.cssbundle_xmlid) self.bundle.css() - self.assertEquals(len(self._any_ira_for_bundle('css')), 1) - self.assertEquals(len(self.bundle.get_attachments('css')), 1) + self.assertEqual(len(self._any_ira_for_bundle('css')), 1) + self.assertEqual(len(self.bundle.get_attachments('css')), 1) def test_09_css_access(self): """ Checks that the bundle's cache is working, i.e. that a bundle creates only enough @@ -183,7 +183,7 @@ class TestJavascriptAssetsBundle(FileTouchable): bundle0 = self._get_asset(self.cssbundle_xmlid) bundle0.css() - self.assertEquals(len(self._any_ira_for_bundle('css')), 1) + self.assertEqual(len(self._any_ira_for_bundle('css')), 1) version0 = bundle0.version ira0 = self._any_ira_for_bundle('css') @@ -192,14 +192,14 @@ class TestJavascriptAssetsBundle(FileTouchable): bundle1 = self._get_asset(self.cssbundle_xmlid) bundle1.css() - self.assertEquals(len(self._any_ira_for_bundle('css')), 1) + self.assertEqual(len(self._any_ira_for_bundle('css')), 1) version1 = bundle1.version ira1 = self._any_ira_for_bundle('css') date1 = ira1.create_date - self.assertEquals(version0, version1) - self.assertEquals(date0, date1) + self.assertEqual(version0, version1) + self.assertEqual(date0, date1) def test_11_css_content_invalidation(self): """ Checks that a bundle is invalidated when its content is modified by adding a file to @@ -210,7 +210,7 @@ class TestJavascriptAssetsBundle(FileTouchable): files0 = bundle0.files version0 = bundle0.version - self.assertEquals(len(self._any_ira_for_bundle('css')), 1) + self.assertEqual(len(self._any_ira_for_bundle('css')), 1) view_arch = """ <data> @@ -232,11 +232,11 @@ class TestJavascriptAssetsBundle(FileTouchable): files1 = bundle1.files version1 = bundle1.version - self.assertNotEquals(files0, files1) - self.assertNotEquals(version0, version1) + self.assertNotEqual(files0, files1) + self.assertNotEqual(version0, version1) # check if the previous attachment are correctly cleaned - self.assertEquals(len(self._any_ira_for_bundle('css')), 1) + self.assertEqual(len(self._any_ira_for_bundle('css')), 1) def test_12_css_debug(self): """ Check that a bundle in debug mode outputs non-minified assets. @@ -248,7 +248,7 @@ class TestJavascriptAssetsBundle(FileTouchable): self.assertIn('/test_assetsbundle/static/src/css/test_cssfile1.css', content) # there shouldn't be any assets created in debug mode - self.assertEquals(len(self._any_ira_for_bundle('css')), 0) + self.assertEqual(len(self._any_ira_for_bundle('css')), 0) def test_14_duplicated_css_assets(self): """ Checks that if the bundle's ir.attachment record is duplicated, the bundle is only sourced once. This could @@ -256,13 +256,13 @@ class TestJavascriptAssetsBundle(FileTouchable): """ bundle0 = self._get_asset(self.cssbundle_xmlid) bundle0.css() - self.assertEquals(len(self._any_ira_for_bundle('css')), 1) + self.assertEqual(len(self._any_ira_for_bundle('css')), 1) # duplicate the asset bundle ira0 = self._any_ira_for_bundle('css') ira1 = ira0.copy() - self.assertEquals(len(self._any_ira_for_bundle('css')), 2) - self.assertEquals(ira0.store_fname, ira1.store_fname) + self.assertEqual(len(self._any_ira_for_bundle('css')), 2) + self.assertEqual(ira0.store_fname, ira1.store_fname) # the ir.attachment records should be deduplicated in the bundle's content nodes = bundle0.to_node() @@ -278,15 +278,15 @@ class TestJavascriptAssetsBundle(FileTouchable): self.bundle = self._get_asset(self.cssbundle_xmlid, env=self.env(context={'lang': 'ar_SY'})) # there shouldn't be any attachment associated to this bundle - self.assertEquals(len(self._any_ira_for_bundle('css', lang='ar_SY')), 0) - self.assertEquals(len(self.bundle.get_attachments('css')), 0) + self.assertEqual(len(self._any_ira_for_bundle('css', lang='ar_SY')), 0) + self.assertEqual(len(self.bundle.get_attachments('css')), 0) # trigger the first generation and, thus, the first save in database self.bundle.css() # there should be one attachment associated to this bundle - self.assertEquals(len(self._any_ira_for_bundle('css', lang='ar_SY')), 1) - self.assertEquals(len(self.bundle.get_attachments('css')), 1) + self.assertEqual(len(self._any_ira_for_bundle('css', lang='ar_SY')), 1) + self.assertEqual(len(self.bundle.get_attachments('css')), 1) def test_16_ltr_and_rtl_css_access(self): """ Checks that the bundle's cache is working, i.e. that the bundle creates only one @@ -297,7 +297,7 @@ class TestJavascriptAssetsBundle(FileTouchable): ltr_bundle0 = self._get_asset(self.cssbundle_xmlid) ltr_bundle0.css() - self.assertEquals(len(self._any_ira_for_bundle('css')), 1) + self.assertEqual(len(self._any_ira_for_bundle('css')), 1) ltr_version0 = ltr_bundle0.version ltr_ira0 = self._any_ira_for_bundle('css') @@ -306,20 +306,20 @@ class TestJavascriptAssetsBundle(FileTouchable): ltr_bundle1 = self._get_asset(self.cssbundle_xmlid) ltr_bundle1.css() - self.assertEquals(len(self._any_ira_for_bundle('css')), 1) + self.assertEqual(len(self._any_ira_for_bundle('css')), 1) ltr_version1 = ltr_bundle1.version ltr_ira1 = self._any_ira_for_bundle('css') ltr_date1 = ltr_ira1.create_date - self.assertEquals(ltr_version0, ltr_version1) - self.assertEquals(ltr_date0, ltr_date1) + self.assertEqual(ltr_version0, ltr_version1) + self.assertEqual(ltr_date0, ltr_date1) # Assets access for ar_SY language rtl_bundle0 = self._get_asset(self.cssbundle_xmlid, env=self.env(context={'lang': 'ar_SY'})) rtl_bundle0.css() - self.assertEquals(len(self._any_ira_for_bundle('css', lang='ar_SY')), 1) + self.assertEqual(len(self._any_ira_for_bundle('css', lang='ar_SY')), 1) rtl_version0 = rtl_bundle0.version rtl_ira0 = self._any_ira_for_bundle('css', lang='ar_SY') @@ -328,23 +328,23 @@ class TestJavascriptAssetsBundle(FileTouchable): rtl_bundle1 = self._get_asset(self.cssbundle_xmlid, env=self.env(context={'lang': 'ar_SY'})) rtl_bundle1.css() - self.assertEquals(len(self._any_ira_for_bundle('css', lang='ar_SY')), 1) + self.assertEqual(len(self._any_ira_for_bundle('css', lang='ar_SY')), 1) rtl_version1 = rtl_bundle1.version rtl_ira1 = self._any_ira_for_bundle('css', lang='ar_SY') rtl_date1 = rtl_ira1.create_date - self.assertEquals(rtl_version0, rtl_version1) - self.assertEquals(rtl_date0, rtl_date1) + self.assertEqual(rtl_version0, rtl_version1) + self.assertEqual(rtl_date0, rtl_date1) # Checks rtl and ltr bundles are different - self.assertNotEquals(ltr_ira1.id, rtl_ira1.id) + self.assertNotEqual(ltr_ira1.id, rtl_ira1.id) # Check two bundles are available, one for ltr and one for rtl css_bundles = self.env['ir.attachment'].search([ ('url', '=like', '/web/content/%-%/{0}%.{1}'.format(self.cssbundle_xmlid, 'css')) ]) - self.assertEquals(len(css_bundles), 2) + self.assertEqual(len(css_bundles), 2) def test_17_css_bundle_date_invalidation(self): """ Checks that both css bundles are invalidated when one of its assets' modification date is changed @@ -371,8 +371,8 @@ class TestJavascriptAssetsBundle(FileTouchable): ltr_last_modified1 = ltr_bundle1.last_modified ltr_version1 = ltr_bundle1.version ltr_ira1 = self._any_ira_for_bundle('css') - self.assertNotEquals(ltr_last_modified0, ltr_last_modified1) - self.assertNotEquals(ltr_version0, ltr_version1) + self.assertNotEqual(ltr_last_modified0, ltr_last_modified1) + self.assertNotEqual(ltr_version0, ltr_version1) rtl_bundle1 = self._get_asset(self.cssbundle_xmlid, env=self.env(context={'lang': 'ar_SY'})) @@ -380,17 +380,17 @@ class TestJavascriptAssetsBundle(FileTouchable): rtl_last_modified1 = rtl_bundle1.last_modified rtl_version1 = rtl_bundle1.version rtl_ira1 = self._any_ira_for_bundle('css', lang='ar_SY') - self.assertNotEquals(rtl_last_modified0, rtl_last_modified1) - self.assertNotEquals(rtl_version0, rtl_version1) + self.assertNotEqual(rtl_last_modified0, rtl_last_modified1) + self.assertNotEqual(rtl_version0, rtl_version1) # Checks rtl and ltr bundles are different - self.assertNotEquals(ltr_ira1.id, rtl_ira1.id) + self.assertNotEqual(ltr_ira1.id, rtl_ira1.id) # check if the previous attachment is correctly cleaned css_bundles = self.env['ir.attachment'].search([ ('url', '=like', '/web/content/%-%/{0}%.{1}'.format(self.cssbundle_xmlid, 'css')) ]) - self.assertEquals(len(css_bundles), 2) + self.assertEqual(len(css_bundles), 2) def test_18_css_bundle_content_invalidation(self): """ Checks that a bundle is invalidated when its content is modified by adding a file to @@ -410,7 +410,7 @@ class TestJavascriptAssetsBundle(FileTouchable): css_bundles = self.env['ir.attachment'].search([ ('url', '=like', '/web/content/%-%/{0}%.{1}'.format(self.cssbundle_xmlid, 'css')) ]) - self.assertEquals(len(css_bundles), 2) + self.assertEqual(len(css_bundles), 2) view_arch = """ <data> @@ -433,8 +433,8 @@ class TestJavascriptAssetsBundle(FileTouchable): ltr_version1 = ltr_bundle1.version ltr_ira1 = self._any_ira_for_bundle('css') - self.assertNotEquals(ltr_files0, ltr_files1) - self.assertNotEquals(ltr_version0, ltr_version1) + self.assertNotEqual(ltr_files0, ltr_files1) + self.assertNotEqual(ltr_version0, ltr_version1) rtl_bundle1 = self._get_asset(self.cssbundle_xmlid, env=self.env(context={'check_view_ids': view.ids, 'lang': 'ar_SY'})) rtl_bundle1.css() @@ -442,17 +442,17 @@ class TestJavascriptAssetsBundle(FileTouchable): rtl_version1 = rtl_bundle1.version rtl_ira1 = self._any_ira_for_bundle('css', lang='ar_SY') - self.assertNotEquals(rtl_files0, rtl_files1) - self.assertNotEquals(rtl_version0, rtl_version1) + self.assertNotEqual(rtl_files0, rtl_files1) + self.assertNotEqual(rtl_version0, rtl_version1) # Checks rtl and ltr bundles are different - self.assertNotEquals(ltr_ira1.id, rtl_ira1.id) + self.assertNotEqual(ltr_ira1.id, rtl_ira1.id) # check if the previous attachment are correctly cleaned css_bundles = self.env['ir.attachment'].search([ ('url', '=like', '/web/content/%-%/{0}%.{1}'.format(self.cssbundle_xmlid, 'css')) ]) - self.assertEquals(len(css_bundles), 2) + self.assertEqual(len(css_bundles), 2) def test_19_css_in_debug_assets(self): """ Checks that a bundle rendered in debug mode(assets) with right to left language direction stores css files in assets bundle. @@ -468,12 +468,12 @@ class TestJavascriptAssetsBundle(FileTouchable): css_bundle = self.env['ir.attachment'].search([ ('url', '=', '/test_assetsbundle/static/src/css/test_cssfile1/rtl/{0}.css'.format(self.cssbundle_xmlid)) ]) - self.assertEquals(len(css_bundle), 1) + self.assertEqual(len(css_bundle), 1) def test_20_exteral_lib_assets(self): html = self.env['ir.ui.view'].render_template('test_assetsbundle.template2') attachments = self.env['ir.attachment'].search([('url', '=like', '/web/content/%-%/test_assetsbundle.bundle4.%')]) - self.assertEquals(len(attachments), 2) + self.assertEqual(len(attachments), 2) self.assertEqual(html.strip(), ("""<!DOCTYPE html> <html> <head> @@ -492,7 +492,7 @@ class TestJavascriptAssetsBundle(FileTouchable): def test_21_exteral_lib_assets_debug_mode(self): html = self.env['ir.ui.view'].render_template('test_assetsbundle.template2', {"debug": "assets"}) attachments = self.env['ir.attachment'].search([('url', '=like', '/web/content/%-%/test_assetsbundle.bundle4.%')]) - self.assertEquals(len(attachments), 0) + self.assertEqual(len(attachments), 0) self.assertEqual(html.strip(), ("""<!DOCTYPE html> <html> <head> @@ -578,8 +578,8 @@ class TestAssetsBundleWithIRAMock(FileTouchable): def _bundle(self, asset, should_create, should_unlink): self.counter.clear() asset.to_node(debug='assets') - self.assertEquals(self.counter['create'], int(should_create)) - self.assertEquals(self.counter['unlink'], int(should_unlink)) + self.assertEqual(self.counter['create'], int(should_create)) + self.assertEqual(self.counter['unlink'], int(should_unlink)) def test_01_debug_mode_assets(self): """ Checks that the ir.attachments records created for compiled assets in debug mode |
