Merge pull request #107 from Helene/unit_test

refine unit_tests

Author: Helene

source/queryHandler/SensorConfig.py

@@ -106,8 +106,7 @@ def parseSensorsConfig(sensorsConfig, logger):
         if sensorsConfig.find("smbstat") != -1:
             sensorsStr = sensorsConfig[sensorsConfig.find("sensors"):sensorsConfig.find("smbstat")]
         else:
-            end = None
-            sensorsStr = sensorsConfig[sensorsConfig.find("sensors"):end]
+            sensorsStr = sensorsConfig[sensorsConfig.find("sensors"):]
         sensorsList = re.findall('(?P<sensor>{.*?})(?:,|$)', sensorsStr)
         for sensorString in sensorsList:
             sensorAttr = re.findall(r'(?P<name>\w+) = (?P<value>\"\S*\"|\d+)', sensorString)

tests/test_zimon_config_parser.py

@@ -26,14 +26,19 @@ def test_case02():
     sensorsList = readSensorsConfig(logger, zimonFile)
     assert isinstance(sensorsList, list)
     assert len(sensorsList) > 0
+    assert len(sensorsList) == 32
 
 
 @with_setup(my_setup)
 def test_case03():
     zimonFile = os.path.join(path, "tests", "test_data", wrongSensorsConfig)
     sensorsList = readSensorsConfig(logger, zimonFile)
+    nfsioConf = sensorsList[0]
     assert isinstance(sensorsList, list)
+    assert isinstance(nfsioConf, dict)
     assert len(sensorsList) > 0
+    assert len(sensorsList) == 1
+    assert nfsioConf.get('name') == '"NFSIO"'
 
 
 @with_setup(my_setup)