From 441da0dba0b7ea9673a48b6595c2b83d0508f062 Mon Sep 17 00:00:00 2001
From: Yves Noirjean <yves.noirjean@id.ethz.ch>
Date: Mon, 14 May 2018 14:14:49 +0200
Subject: [PATCH] obis_SSDM-6476: obis - fixing tests
---
src/python/OBis/obis/dm/config.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/python/OBis/obis/dm/config.py b/src/python/OBis/obis/dm/config.py
index 91a4b9bf3d2..243688208d7 100644
--- a/src/python/OBis/obis/dm/config.py
+++ b/src/python/OBis/obis/dm/config.py
@@ -296,9 +296,12 @@ class ConfigResolver(object):
""" This class functions as a wrapper since we have multiple config resolvers. """
def __init__(self, location_resolver=None):
+ self.repository_resolver = ConfigResolverImpl(location_resolver=location_resolver, env=RepositoryEnv(), config_file='repository.json')
+ # TODO remove config_resolver in the end
+ self.config_resolver = ConfigResolverImpl(location_resolver=location_resolver, env=ConfigEnv())
self.resolvers = []
- self.resolvers.append(ConfigResolverImpl(location_resolver=location_resolver, env=ConfigEnv()))
- self.resolvers.append(ConfigResolverImpl(location_resolver=location_resolver, env=RepositoryEnv(), config_file='reposiory.json'))
+ self.resolvers.append(self.config_resolver)
+ self.resolvers.append(self.repository_resolver)
def config_dict(self, local_only=False):
combined_dict = {}
--
GitLab