From 558509bf456177d4d72ce869fb31cd347fad40ae Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Thu, 13 Feb 2020 11:02:29 +0100 Subject: [PATCH] server_environment: Improve tests.common to allow redefinition of serv_config application --- server_environment/tests/common.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server_environment/tests/common.py b/server_environment/tests/common.py index b145b7a..781ce25 100644 --- a/server_environment/tests/common.py +++ b/server_environment/tests/common.py @@ -44,13 +44,13 @@ class ServerEnvironmentCase(common.SavepointCase): yield @contextmanager - def load_config(self, public=None, secret=None): - original_serv_config = server_env_mixin.serv_config + def load_config(self, public=None, secret=None, serv_config_class=server_env_mixin): + original_serv_config = serv_config_class.serv_config try: with self.set_config_dir(None), self.set_env_variables(public, secret): parser = server_env._load_config() - server_env_mixin.serv_config = parser + serv_config_class.serv_config = parser yield finally: - server_env_mixin.serv_config = original_serv_config + serv_config_class.serv_config = original_serv_config