From ecce24d296639a89833fc92f9e09358c44ab1e77 Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Fri, 10 Apr 2020 10:04:39 +0200 Subject: [PATCH] fixup! server_environment: running_env default to `test` (fix #44) --- server_environment/serv_config.py | 7 ++++--- server_environment/tests/common.py | 14 ------------- .../tests/test_environment_variable.py | 19 +++++++++--------- .../tests/test_server_environment.py | 20 ++++++++++++++++--- 4 files changed, 31 insertions(+), 29 deletions(-) diff --git a/server_environment/serv_config.py b/server_environment/serv_config.py index 56cbf3d..aad7798 100644 --- a/server_environment/serv_config.py +++ b/server_environment/serv_config.py @@ -169,9 +169,6 @@ class ServerConfiguration(models.TransientModel): """ ModelClass = super(ServerConfiguration, cls)._build_model(pool, cr) ModelClass._add_columns() - ModelClass.running_env = system_base_config['running_env'] - # Only show passwords in development - ModelClass.show_passwords = ModelClass.running_env in ('dev',) ModelClass._arch = None ModelClass._build_osv() return ModelClass @@ -180,6 +177,10 @@ class ServerConfiguration(models.TransientModel): def _format_key(cls, section, key): return '%s_I_%s' % (section, key) + @property + def show_passwords(self): + return system_base_config["running_env"] in ("dev",) + @classmethod def _format_key_display_name(cls, key_name): return key_name.replace('_I_', ' | ') diff --git a/server_environment/tests/common.py b/server_environment/tests/common.py index d71703d..7476760 100644 --- a/server_environment/tests/common.py +++ b/server_environment/tests/common.py @@ -7,7 +7,6 @@ from unittest.mock import patch from odoo.tests import common from odoo.addons.server_environment import server_env -from odoo.tools.config import config import odoo.addons.server_environment.models.server_env_mixin as \ server_env_mixin @@ -15,19 +14,6 @@ import odoo.addons.server_environment.models.server_env_mixin as \ class ServerEnvironmentCase(common.SavepointCase): - _test_case_running_env = "testing" - - def setUp(self): - super().setUp() - self._original_running_env = config.get('running_env') - if self._test_case_running_env is not None: - config['running_env'] = self._test_case_running_env - server_env._load_running_env() - - def tearDown(self): - super().tearDown() - config['running_env'] = self._original_running_env - @contextmanager def set_config_dir(self, path): original_dir = server_env._dir diff --git a/server_environment/tests/test_environment_variable.py b/server_environment/tests/test_environment_variable.py index 3ff948c..d326032 100644 --- a/server_environment/tests/test_environment_variable.py +++ b/server_environment/tests/test_environment_variable.py @@ -2,12 +2,21 @@ # License GPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo.tools.config import config +from unittest.mock import patch + +from odoo.tools.config import config as odoo_config from odoo.addons.server_environment import server_env from .common import ServerEnvironmentCase +class TestRunningEnvDefault(ServerEnvironmentCase): + def test_running_env_default(self): + """When var is not provided it defaults to `test`.""" + self.assertEqual(odoo_config["running_env"], "test") + + +@patch.dict(odoo_config.options, {"running_env": "testing"}) class TestEnvironmentVariables(ServerEnvironmentCase): def test_env_variables(self): @@ -45,11 +54,3 @@ class TestEnvironmentVariables(ServerEnvironmentCase): parser = server_env._load_config() val = parser.get('external_service.ftp', 'user') self.assertEqual(val, 'foo') - - -class TestRunningEnv(ServerEnvironmentCase): - - _test_case_running_env = '' # empty -> no env set - - def test_running_env_default(self): - self.assertEqual(config['running_env'], 'test') diff --git a/server_environment/tests/test_server_environment.py b/server_environment/tests/test_server_environment.py index ee33798..46031a3 100644 --- a/server_environment/tests/test_server_environment.py +++ b/server_environment/tests/test_server_environment.py @@ -1,5 +1,10 @@ # Copyright 2018 Camptocamp (https://www.camptocamp.com). # License GPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from unittest.mock import patch + +from odoo.tools.config import config as odoo_config + from odoo.addons.server_environment import server_env from . import common @@ -11,7 +16,7 @@ class TestEnv(common.ServerEnvironmentCase): view = model.fields_view_get() self.assertTrue(view) - def test_default(self): + def _test_default(self, hidden_pwd=False): model = self.env['server.config'] rec = model.create({}) defaults = rec.default_get([]) @@ -20,11 +25,20 @@ class TestEnv(common.ServerEnvironmentCase): pass_checked = False for default in defaults: if 'passw' in default: - self.assertNotEqual(defaults[default], - '**********') + check = self.assertEqual if hidden_pwd else self.assertNotEqual + check(defaults[default], "**********") pass_checked = True self.assertTrue(pass_checked) + @patch.dict(odoo_config.options, {"running_env": "dev"}) + def test_default_dev(self): + self._test_default() + + @patch.dict(odoo_config.options, {"running_env": "whatever"}) + def test_default_non_dev_env(self): + self._test_default(hidden_pwd=True) + + @patch.dict(odoo_config.options, {"running_env": "testing"}) def test_value_retrival(self): with self.set_config_dir('testfiles'): parser = server_env._load_config()