Merge pull request #1105 from metno/fix-config-tests

Fix test_Config_read_config
metno · Apr 9, 2024 · f5bd073 · f5bd073
2 parents 4032e09 + dfb1fa9
commit f5bd073
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -113,26 +113,24 @@ def test_Config_has_access_users_database():
 
 
 @pytest.mark.parametrize(
-    "cfg_id,basedir,init_obslocs_ungridded,init_data_search_dirs,data_searchdirno",
+    "cfg_id,basedir,init_obslocs_ungridded,init_data_search_dirs",
     [
-        ("metno", None, False, False, 0),
-        ("metno", None, True, False, 0),
-        ("metno", None, True, True, 0),
-        ("metno", f"/home/{USER}", True, True, 2),
-        ("users-db", None, False, False, 0),
+        ("metno", None, False, False),
+        ("metno", None, True, False),
+        ("metno", None, True, True),
+        ("metno", f"/home/{USER}", True, True),
+        ("users-db", None, False, False),
     ],
 )
-def test_Config_read_config(
-    cfg_id, basedir, init_obslocs_ungridded, init_data_search_dirs, data_searchdirno
-):
+def test_Config_read_config(cfg_id, basedir, init_obslocs_ungridded, init_data_search_dirs):
     cfg = testmod.Config(try_infer_environment=False)
     cfg_file = cfg._config_files[cfg_id]
     assert Path(cfg_file).exists()
     cfg.read_config(cfg_file, basedir, init_obslocs_ungridded, init_data_search_dirs)
     if not cfg.has_access_lustre:
         pytest.skip(f"Skipping since {cfg._LUSTRE_CHECK_PATH} directory not accessible")
-    assert len(cfg.DATA_SEARCH_DIRS) == data_searchdirno
-    assert len(cfg.OBSLOCS_UNGRIDDED) == 0
+    assert all([Path(idir).exists() for idir in cfg.DATA_SEARCH_DIRS])
+    assert cfg.OBSLOCS_UNGRIDDED
     assert Path(cfg.OUTPUTDIR).exists()
     assert Path(cfg.COLOCATEDDATADIR).exists()
     assert Path(cfg.CACHEDIR).exists()