update unit tests

Signed-off-by: hwassman <[email protected]>

Author: Helene

tests/test_cli_parser.py

@@ -14,7 +14,7 @@ def my_setup():
     e = ['-c', '10', '-t', '/opt/registry/certs']
     f = ['-c', '10', '-s', '9.155.108.199', '-p', '8443', '-t', '/opt/registry/certs', '--tlsKeyFile', 'privkey.pem', '--tlsCertFile', 'cert.pem']
     g = ['-p', '4242', '-P', '9084']
-    h = ['-d', 'no']
+    h = ['-p', '4242', '-e', '9250', '-d', 'no']
     k = ['-p', '4243', '-r', 'https']
 
 
@@ -35,8 +35,12 @@ def test_case03():
     args, msg = parse_cmd_args([])
     result = vars(args)
     elements = list(result.keys())
-    mandatoryItems = ['port', 'serverPort']
-    assert all(item in elements for item in mandatoryItems)
+    if version < "8.0":
+        mandatoryItems = ['port', 'serverPort']
+        assert all(item in elements for item in mandatoryItems)
+    else:
+        mandatoryItems = ['server', 'serverPort']
+        assert all(item in elements for item in mandatoryItems)
 
 
 @with_setup(my_setup)
@@ -73,17 +77,27 @@ def test_case06():
 
 @with_setup(my_setup)
 def test_case07():
-    args, msg = parse_cmd_args(a)
-    result = vars(args)
-    assert len(result.keys()) > 0
-    assert 'port' in result.keys()
-    assert 'protocol' in result.keys()
-    assert result.get('port') == 8443
-    assert result.get('protocol') is None
+    if version < "8.0":
+        args, msg = parse_cmd_args(a)
+        result = vars(args)
+        assert len(result.keys()) > 0
+        assert 'port' in result.keys()
+        assert 'protocol' in result.keys()
+        assert result.get('port') == 8443
+        assert result.get('protocol') is None
+    else:
+        args, msg = parse_cmd_args(a)
+        result = vars(args)
+        assert len(result.keys()) > 0
+        assert 'port' in result.keys()
+        assert 'protocol' in result.keys()
+        assert result.get('port') == '8443'
+        assert result.get('protocol') is None
 
 
+@with_setup(my_setup)
 def test_case08():
-    args, msg = parse_cmd_args([])
+    args, msg = parse_cmd_args(a)
     result = vars(args)
     assert 'includeDiskData' in result.keys()
     assert result.get('includeDiskData') is None

tests/test_configManager.py

@@ -27,7 +27,10 @@ def test_case04():
     assert len(connection) > 0
     assert isinstance(connection, dict)
     assert len(connection) > 0
-    assert 'port' in connection.keys()
+    if version < "8.0":
+        assert 'port' in connection.keys()
+    else:
+        assert 'port' not in connection.keys()
 
 
 def test_case05():
@@ -53,24 +56,31 @@ def test_case08():
     cm = ConfigManager()
     result = cm.defaults
     elements = list(result.keys())
-    mandatoryItems = ['port', 'serverPort']
-    assert all(item in elements for item in mandatoryItems)
+    if version < "8.0":
+        mandatoryItems = ['port', 'serverPort']
+        assert all(item in elements for item in mandatoryItems)
+    else:
+        assert 'port' not in set(elements)
 
 
 def test_case09():
-    cm = ConfigManager()
-    result = cm.defaults
-    value = int(result['port'])
-    assert value == 4242
+    if version < "8.0":
+        cm = ConfigManager()
+        result = cm.defaults
+        value = int(result['port'])
+        assert value == 4242
 
 
 def test_case10():
     cm = ConfigManager()
     result = cm.defaults
     if version < "7.0":
         assert int(result['port']) == 4242 and int(result['serverPort']) == 9084
-    else:
+    elif version < "8.0":
         assert int(result['port']) == 4242 and int(result['serverPort']) == 9980
+    else:
+        assert result.get('port', None) == None
+        assert int(result['serverPort']) == 9980
 
 
 def test_case11():

tests/test_params.py

@@ -4,7 +4,7 @@
 
 
 def my_setup():
-    global a, b, c, d, e, f, g, m, n, o, p, y, x
+    global a, b, c, d, e, f, g, m, n, o, p, y, x, r, s
     a = ConfigManager().defaults
     y = ConfigManager().defaults.copy()
     y['apiKeyValue'] = '/tmp/mykey'
@@ -14,13 +14,18 @@ def my_setup():
     f, g = parse_cmd_args(['-p', '8443', '-t', None, '-k', 'None', '-m', "None"])
     m, n = parse_cmd_args(['-d', 'yes'])
     o, p = parse_cmd_args(['-v', 'e40960c9-de0a-4c75-bc71-0bcae6db23b2'])
+    r, s = parse_cmd_args(['-p', '4242', '-e', '9250'])
 
 
 @with_setup(my_setup)
 def test_case01():
     result = merge_defaults_and_args(a, b)
     assert len(result.keys()) > 0
-    assert 'port' in result.keys()
+    if version < "8.0":
+        assert 'port' in result.keys()
+    else:
+        assert 'port' not in result.keys()
+        assert 'prometheus' not in result.keys()
     assert 'serverPort' in result.keys()
     assert 'apiKeyValue' not in result.keys()
 
@@ -138,10 +143,25 @@ def test_case12():
 @with_setup(my_setup)
 def test_case13():
     x = a.copy()
-    del x['port']
+    if version < "8.0":
+        del x['port']
     result = merge_defaults_and_args(x, b)
     valid, msg = checkApplicationPort(result)
     assert len(result.keys()) > 0
     assert 'port' not in result.keys()
+    if version >= "8.0":
+        assert 'prometheus' not in result.keys()
     assert valid == False
     assert len(msg) > 0
+
+
+@with_setup(my_setup)
+def test_case14():
+    if version >= "8.0":
+        result = merge_defaults_and_args(a, r)
+        valid, msg = checkApplicationPort(result)
+        assert len(result.keys()) > 0
+        assert 'port' in result.keys()
+        assert 'prometheus' in result.keys()
+        assert valid == True
+        assert len(msg) == 0