Add a loader for tests in order to bootstrap settings

globconf.d/global.ini

@@ -0,0 +1,3 @@
+[lodel2]
+lib_path = /home/yannweb/dev/lodel2/lodel2-git
+plugins_path = /home/yannweb/dev/lodel2/lodel2-git/plugins

globconf.d/loggers.ini

@@ -0,0 +1,4 @@
+[lodel2.logging.default]
+level = DEBUG
+context = True
+filename = -

lodel/settings/__init__.py

@@ -1,5 +1,5 @@
 #-*- coding: utf-8 -*-
 
-#from .settings import Settings as SettingsHandler
-
-#Settings = SettingsHandler(conf_file = './settings.ini')
+from lodel.settings.settings import Settings as SettingsHandler
+settings = SettingsHandler.bootstrap()
+Settings = settings.confs

lodel/settings/settings.py

@@ -31,6 +31,7 @@ from lodel.settings.settings_loader import SettingsLoader
 # - value validation/cast (see @ref Lodel.settings.validator.ConfValidator )
 # 
 
+## @brief A default python system lib path
 PYTHON_SYS_LIB_PATH = '/usr/local/lib/python{major}.{minor}/'.format(
 
                                                                         major = sys.version_info.major,
@@ -73,7 +74,9 @@ class Settings(object):
             'plugins_path': (   PYTHON_SYS_LIB_PATH+'lodel2/plugins/',
                                 SettingValidator('directory_list')),
     }
+    instance = None
     
+    ## @brief Should be called only by the boostrap classmethod
     def __init__(self, conf_file = '/etc/lodel2/lodel2.conf', conf_dir = 'conf.d'):
         self.__confs = dict()
         self.__conf_dir = conf_dir
@@ -82,6 +85,13 @@ class Settings(object):
         #   and self.__confs['lodel2']['lib_path'] set
         self.__bootstrap()
     
+    ## @brief Stores as class attribute a Settings instance
+    @classmethod
+    def bootstrap(cls, conf_file = None, conf_dir = None):
+        if cls.instance is None:
+            cls.instance = cls(conf_file, conf_dir)
+        return cls.instance
+
     ## @brief Configuration keys accessor
     # @return All confs organised into named tuples
     @property
@@ -140,12 +150,9 @@ class Settings(object):
         # Construct final specs dict replacing variable sections
         # by the actual existing sections
         variable_sections = [ section for section in specs if section.endswith('.*') ]
-        print("DEBUG VARIABLE SECTIONS : ")
         for vsec in variable_sections:
             preffix = vsec[:-2]
-            print("PREFFIX =  ", preffix)
             for section in loader.getsection(preffix, 'default'): #WARNING : hardcoded default section
-                print("SECTIONs = ", section)
                 specs[section] = copy.copy(specs[vsec])
             del(specs[vsec])
         # Fetching valuds for sections

tests/editorial_model/test_model.py

@@ -2,6 +2,7 @@
 
 import unittest
 
+import tests.loader_utils
 from lodel.editorial_model.model import EditorialModel
 from lodel.editorial_model.components import EmComponent, EmClass, EmField, EmGroup
 from lodel.utils.mlstring import MlString

tests/editorial_model/test_translator_picklefile.py

@@ -4,6 +4,7 @@ import unittest
 import tempfile
 import os
 
+import tests.loader_utils
 from lodel.editorial_model.translator import picklefile
 from lodel.editorial_model.model import EditorialModel
 from lodel.editorial_model.components import *

tests/leapi/test_lefactory.py

@@ -3,6 +3,7 @@
 import unittest
 import random
 
+import tests.loader_utils
 from lodel.editorial_model.model import EditorialModel
 from lodel.leapi import lefactory
 

tests/loader_utils.py

@@ -0,0 +1,8 @@
+#-*- coding: utf-8 -*-
+
+#
+# This file should be imported in every tests files
+#
+
+from lodel.settings.settings import Settings
+Settings.bootstrap(conf_file = 'settings.ini', conf_dir = 'globconf.d')

tests/settings/test_settings.py

@@ -3,6 +3,7 @@
 import unittest
 from unittest import mock
 
+import tests.loader_utils
 from lodel.settings.settings import Settings
 
 class SettingsTestCase(unittest.TestCase):

tests/settings/test_settings_loader.py

@@ -1,13 +1,15 @@
 #-*- coding: utf-8 -*-
 
 import unittest
+
+import tests.loader_utils
 from lodel.settings.settings_loader import SettingsLoader
 
 class SettingsLoaderTestCase(unittest.TestCase):
 
     def test_merge_getsection(self):
         """Tests merge and getSection functions """
-        settings = SettingsLoader('/home/helene/lodel2/tests/settings/conf.d')
+        settings = SettingsLoader('tests/settings/conf.d')
         a = settings.getsection('A')
         self.assertEqual(a,dict({"a":"a1","b":"b1,b2,b3","c":"toto","fhui":"njl"}))
         b = settings.getsection('B')
@@ -39,4 +41,4 @@ class SettingsLoaderTestCase(unittest.TestCase):
         self.assertEqual(g,[])
         
         
-        
+        

tests/test_utils_mlstrings.py

@@ -3,6 +3,8 @@
 import unittest
 import copy
 
+
+import tests.loader_utils
 from lodel.utils.mlstring import MlString
 
 class MlStringTestCase(unittest.TestCase):