additional minor polish to test_nc_domains refactor

EC-USGS · Sep 14, 2023 · 579093b · 579093b
1 parent 9e42c92
commit 579093b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/test_data/scripts/conftest.py b/test_data/scripts/conftest.py
@@ -142,7 +142,7 @@ def pytest_generate_tests(metafunc):
     csv_files = collect_csv_files(simulations)
 
     if "csv_file" in metafunc.fixturenames:
-        ids = [ff.parent.name + ":" + ff.name for ff in csv_files]
+        ids = [ff.parent.parent.name + ":" + ff.name for ff in csv_files]
         metafunc.parametrize("csv_file", csv_files, ids=ids)
 
     if "soltab_file" in metafunc.fixturenames:

diff --git a/test_data/scripts/test_nc_domains.py b/test_data/scripts/test_nc_domains.py
@@ -92,7 +92,7 @@ def soltab_netcdf_file(tmp_path_factory, soltab_file) -> Path:
     nc_paths = []
 
     with FileLock(root_tmpdir / "soltab_nc.lock"):
-        yield soltab_file  # wait til session cleanup
+        yield  # postpone the work until session cleanup
 
         # this is a hack that should probably rely on the yaml if/when this
         # fails
@@ -126,7 +126,7 @@ def final_netcdf_file(tmp_path_factory, simulation) -> Path:
     nc_path = data_dir / "through_rain.nc"
 
     with FileLock(root_tmpdir / "final_nc.lock"):
-        yield nc_path  # wait til session cleanup
+        yield  # do this in session cleanup
 
         if nc_path.is_file():
             return