server_environment: Improve tests.common to allow redefinition of serv_config application
This commit is contained in:
parent
ab39d7741c
commit
61f2e3fcf9
|
|
@ -44,13 +44,13 @@ class ServerEnvironmentCase(common.SavepointCase):
|
||||||
yield
|
yield
|
||||||
|
|
||||||
@contextmanager
|
@contextmanager
|
||||||
def load_config(self, public=None, secret=None):
|
def load_config(self, public=None, secret=None, serv_config_class=server_env_mixin):
|
||||||
original_serv_config = server_env_mixin.serv_config
|
original_serv_config = serv_config_class.serv_config
|
||||||
try:
|
try:
|
||||||
with self.set_config_dir(None), self.set_env_variables(public, secret):
|
with self.set_config_dir(None), self.set_env_variables(public, secret):
|
||||||
parser = server_env._load_config()
|
parser = server_env._load_config()
|
||||||
server_env_mixin.serv_config = parser
|
serv_config_class.serv_config = parser
|
||||||
yield
|
yield
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
server_env_mixin.serv_config = original_serv_config
|
serv_config_class.serv_config = original_serv_config
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue