add method to merge config params from config file and cmd together

Author: Helene

source/confParser.py

@@ -42,8 +42,17 @@ def findCertFile(path):
                 return name
     return None
 
+def merge_defaults_and_args(defaults, args):
+    '''merge default config parameters with input parameters from the command line'''
+    brConfig = {}
+    brConfig = dict(defaults)
+    args = vars(args)
+    brConfig.update({k: v for k, v in args.items() if v is not None})
+    return brConfig
+
 
 def parse_defaults_from_config_file(fileName='config.ini'):
+    '''parse default parameters from a config file'''
     defaults = {}
     dirname, filename = os.path.split(os.path.abspath(__file__))
     conf_file = os.path.join(dirname, fileName)

tests/test_params.py

@@ -1,4 +1,11 @@
-from source.confParser import parse_defaults_from_config_file
+from source.confParser import parse_defaults_from_config_file, merge_defaults_and_args, parse_cmd_args
+from nose.tools import with_setup
+
+
+def my_setup(): 
+    global a,b,c
+    a = parse_defaults_from_config_file()
+    b,c = parse_cmd_args([])
 
 
 def test_case01():
@@ -27,3 +34,11 @@ def test_case04():
 def test_case05():
     result = parse_defaults_from_config_file()
     assert int(result['port']) == 4242 and int(result['serverPort']) == 9084
+
+
+@with_setup(my_setup)
+def test_case06():
+    result = merge_defaults_and_args(a, b)
+    assert len(result.keys()) > 0
+    assert 'port' in result.keys()
+    assert 'serverPort' in result.keys()