Added app config bypass for testing

UCSD-E4E · Feb 28, 2023 · a9506a4 · a9506a4
1 parent 39af7ee
commit a9506a4
Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/e4e_data_management/config.py b/e4e_data_management/config.py
@@ -67,23 +67,24 @@ class AppConfiguration:
 
     __app_config_instance = None
     @classmethod
-    def get_instance(cls) -> AppConfiguration:
+    def get_instance(cls, config_dir: Optional[Path] = None) -> AppConfiguration:
         """Retrieves the singleton Configuration instance
 
         Returns:
             Configuration: Configuration singleton
         """
         # global __app_config_instance # pylint: disable=invalid-name,global-statement
         if cls.__app_config_instance is None:
-            cls.__app_config_instance = cls.__load()
+            cls.__app_config_instance = cls.__load(config_dir=config_dir)
         return cls.__app_config_instance
 
     @classmethod
-    def __load(cls) -> AppConfiguration:
-        config_dir = Path(appdirs.user_config_dir(
-            appname='E4EDataManagement',
-            appauthor='Engineers for Exploration'
-        ))
+    def __load(cls, *, config_dir: Optional[Path] = None) -> AppConfiguration:
+        if config_dir is None:
+            config_dir = Path(appdirs.user_config_dir(
+                appname='E4EDataManagement',
+                appauthor='Engineers for Exploration'
+            ))
 
         config_file = config_dir.joinpath('config.pkl')
         if not config_file.exists():

diff --git a/e4e_data_management/core.py b/e4e_data_management/core.py
@@ -11,9 +11,9 @@
 
 
 class DataManager:
-    def __init__(self):
+    def __init__(self, *, app_config_dir: Optional[Path] = None):
         self.__log = logging.getLogger('DataManager')
-        self.appconfig = AppConfiguration.get_instance()
+        self.appconfig = AppConfiguration.get_instance(config_dir=app_config_dir)
         self.active_dataset: Optional[Dataset] = None
         self.dataset_config: Optional[ExpeditionConfiguration] = None
         if self.appconfig.current_dataset: