Fix load_sq_config calls in tests

Signed-off-by: Claudio Lorina <[email protected]>

Author: claudiolor

tests/integration/test_rest_http.py

@@ -21,7 +21,7 @@ def test_server_exec():
     port = randint(9000, 10000)
     # We need to change the port used to avoid conflicts
     cfgfile = create_dummy_config_file()
-    sqcfg = load_sq_config(cfgfile)
+    sqcfg = load_sq_config(config_file=cfgfile)
 
     if 'rest' not in sqcfg:
         sqcfg['rest'] = {'port': port}

tests/integration/test_update_data.py

@@ -46,7 +46,7 @@ def copytree(src, dst, symlinks=False, ignore=None):
 def create_config(t_dir, suzieq_dir):
     '''Create dummy config'''
     # We need to create a tempfile to hold the config
-    tmpconfig = load_sq_config(conftest.create_dummy_config_file())
+    tmpconfig = load_sq_config(config_file=conftest.create_dummy_config_file())
     tmpconfig['data-directory'] = f"{t_dir}/parquet"
     tmpconfig['service-directory'] = \
         f"{suzieq_dir}/{tmpconfig['service-directory']}"
@@ -453,7 +453,8 @@ def _test_data(topology, proto, scenario, testvar):
     # pylint: disable=redefined-outer-name
     name = f'{topology}_{proto}_{scenario}'
     testvar['data-directory'] = f"{parquet_dir}/{name}/parquet-out"
-    dummy_config = load_sq_config(conftest.create_dummy_config_file())
+    dummy_config = load_sq_config(
+        config_file=conftest.create_dummy_config_file())
     _test_sqcmds(dummy_config, testvar)
 
 

tests/unit/poller/controller/manager/test_static_manager.py

@@ -43,7 +43,7 @@ def manager_cfg():
     """
     args = {}
     args['config'] = create_dummy_config_file()
-    args['config-dict'] = load_sq_config(args['config'])
+    args['config-dict'] = load_sq_config(config_file=args['config'])
     yield args
     os.remove(args['config'])
 

tests/unit/poller/worker/services/test_service.py

@@ -24,7 +24,7 @@ def service_for_diff():
     """Init the service for testing the get_diff() function
     """
     cfg_file = create_dummy_config_file()
-    cfg = load_sq_config(cfg_file)
+    cfg = load_sq_config(config_file=cfg_file)
     # Build the shema
     schema_dir = cfg['schema-directory']
     schema = Schema(schema_dir)

tests/unit/poller/worker/test_worker.py

@@ -82,7 +82,7 @@ async def run_worker_with_mocks(poller: Worker) -> Dict[str, MagicMock]:
 def test_worker_object_init_validation(poller_args):
     """Test Poller object user_args validation
     """
-    cfg = load_sq_config(poller_args.config)
+    cfg = load_sq_config(config_file=poller_args.config)
 
     # Test invalid ssh config file
     poller_args.ssh_config_file = 'invalid'
@@ -98,7 +98,7 @@ def test_worker_object_init_validation(poller_args):
 async def test_add_pop_worker_task(poller_args):
     """Test the methods for adding and removing the poller tasks
     """
-    cfg = load_sq_config(poller_args.config)
+    cfg = load_sq_config(config_file=poller_args.config)
     poller = Worker(poller_args, cfg)
     # Test add_poller_task()
     tasks = [asyncio.Future(), asyncio.Future()]
@@ -122,7 +122,7 @@ async def test_add_pop_worker_task(poller_args):
 async def test_poller_worker_run(poller_args):
     """Check if all the services are launched after calling Poller.run()
     """
-    cfg = load_sq_config(poller_args.config)
+    cfg = load_sq_config(config_file=poller_args.config)
     poller = Worker(poller_args, cfg)
 
     mks = await run_worker_with_mocks(poller)
@@ -138,7 +138,7 @@ async def test_poller_worker_run(poller_args):
 def test_worker_inventory_init(poller_args):
     """Test if all the parameters are correctly passed to the Inventory
     """
-    cfg = load_sq_config(poller_args.config)
+    cfg = load_sq_config(config_file=poller_args.config)
     poller_args.ssh_config_file = 'config/file'
     cfg['poller']['connect-timeout'] = 30
     with patch.multiple(Worker, _validate_worker_args=MagicMock()):
@@ -158,7 +158,7 @@ def test_worker_inventory_init_addnl_args(poller_args):
     """Test if all the additional params are actually passed to the
     Inventory class init function
     """
-    cfg = load_sq_config(poller_args.config)
+    cfg = load_sq_config(config_file=poller_args.config)
     poller_args.ssh_config_file = 'config/file'
     cfg['poller']['connect-timeout'] = 30
     dummy_inventory_class = MagicMock()
@@ -202,7 +202,7 @@ def test_worker_inventory_init_addnl_args(poller_args):
 def test_worker_service_manager_init(poller_args):
     """Test if all the parameters are correctly passed to the ServiceManager
     """
-    cfg = load_sq_config(poller_args.config)
+    cfg = load_sq_config(config_file=poller_args.config)
     poller_args.run_once = 'gather'
     cfg['poller']['period'] = 30
     poller = Worker(poller_args, cfg)

tests/unit/test_sqconfig_load.py

@@ -56,7 +56,7 @@ def test_config_validation(monkeypatch):
     """Test the sq config validation
     """
 
-    base_cfg = load_sq_config(create_dummy_config_file())
+    base_cfg = load_sq_config(config_file=create_dummy_config_file())
 
     # not a dict
     cfg = []

tests/utilities/update_sqcmds.py

@@ -15,7 +15,7 @@ def create_config(testvar):
     if 'data-directory' in testvar:
         # We need to create a tempfile to hold the config
         tf = conftest.create_dummy_config_file()
-        tmpconfig = load_sq_config(tf)
+        tmpconfig = load_sq_config(config_file=tf)
         tmpconfig['data-directory'] = testvar['data-directory']
 
         with open(tf, 'w') as f: