Merge pull request #356 from Helene/conf_unit_test

Add unit test for checkForInvalidsettings

Author: Helene

source/confParser.py

@@ -92,11 +92,12 @@ def checkCAsettings(args):
 
 
 def checkForInvalidsettings(args):
-    if not all(args.values()):
+    if all(args.values()):
+        return True, ''
+    else:
         for key, value in args.items():
             if value is None or value == '':
                 return False, MSG['InvalidConfigParm'].format(key)
-    else:
         return True, ''
 
 

tests/test_params.py

@@ -1,7 +1,8 @@
 from source.confParser import (ConfigManager, merge_defaults_and_args,
                                parse_cmd_args, checkCAsettings,
                                checkApplicationPort,
-                               checkBasicAuthsettings)
+                               checkBasicAuthsettings,
+                               checkForInvalidsettings)
 from source.__version__ import __version__ as version
 from nose2.tools.decorators import with_setup
 
@@ -209,3 +210,18 @@ def test_case17():
         assert len(result.keys()) > 0
         assert 'rawCounters' in result.keys()
         assert result.get('rawCounters') == eval("False")
+
+
+@with_setup(my_setup)
+def test_case18():
+    if version > "8.0.9":
+        z = y.copy()
+        z['apiKeyValue'] = ''
+        result = merge_defaults_and_args(y, r)
+        result1 = merge_defaults_and_args(z, r)
+        valid, msg = checkForInvalidsettings(result)
+        valid1, msg1 = checkForInvalidsettings(result1)
+        assert valid
+        assert not valid1
+        assert msg == ''
+        assert len(msg1) > 1

tests/test_parser.py

@@ -4,12 +4,13 @@
 
 def test_case01():
     result = os.system('python ./source/zimonGrafanaIntf.py')
-    assert result > 0
+    print(result)
+    assert result == 0
 
 
 def test_case02():
     result = os.system('python ./source/zimonGrafanaIntf.py -a 2')
-    assert result > 0
+    assert result == 0
 
 
 def test_case03():
@@ -19,7 +20,7 @@ def test_case03():
 
 def test_case04():
     result = os.system('python ./source/zimonGrafanaIntf.py -c 10 -m "/opt/registry/certs"')
-    assert result > 0
+    assert result == 0
 
 
 def test_case05():