diff --git a/pyproject.toml b/pyproject.toml index 5d33ee76..178f31f2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,6 +72,7 @@ testpaths = [ "docs", ] addopts = "--doctest-modules --doctest-glob=*.rst" +log_cli_level = "INFO" [tool.coverage.report] omit = [ diff --git a/src/hats_import/runtime_arguments.py b/src/hats_import/runtime_arguments.py index 327fbfd1..f59e44ac 100644 --- a/src/hats_import/runtime_arguments.py +++ b/src/hats_import/runtime_arguments.py @@ -10,7 +10,7 @@ import pandas as pd from hats.catalog import TableProperties from hats.io import file_io -from hats.io.validation import is_valid_catalog +from hats.io.validation import _is_catalog_info_valid from hats.pixel_math import spatial_index from upath import UPath @@ -116,7 +116,7 @@ def _check_arguments(self): raise ValueError("dask_threads_per_worker should be greater than 0") self.catalog_path = file_io.get_upath(self.output_path) / self.output_artifact_name - if is_valid_catalog(self.catalog_path): + if _is_catalog_info_valid(self.catalog_path): raise ValueError(f"Output path {self.catalog_path} already contains a valid catalog") if not self.resume: file_io.remove_directory(self.catalog_path, ignore_errors=True) diff --git a/tests/hats_import/verification/test_run_verification.py b/tests/hats_import/verification/test_run_verification.py index bb0f7b10..bb591e98 100644 --- a/tests/hats_import/verification/test_run_verification.py +++ b/tests/hats_import/verification/test_run_verification.py @@ -1,3 +1,5 @@ +import logging + import pandas as pd import pytest @@ -75,19 +77,21 @@ def test_test_is_valid_catalog(small_sky_object_catalog, wrong_files_and_rows_di assert not passed, "bad catalog passed" -def test_test_is_valid_collection(test_data_dir, tmp_path, capsys): +def test_test_is_valid_collection(test_data_dir, tmp_path, caplog, capsys): """`hats.is_valid_catalog` should pass for good catalogs, fail for catalogs without ancillary files.""" + caplog.at_level(logging.INFO) args = VerificationArguments( input_catalog_path=test_data_dir / "small_sky_collection", output_path=tmp_path, verbose=True ) verifier = runner.run(args) passed = verifier.test_is_valid_catalog() assert passed, "good catalog failed" - captured = capsys.readouterr().out - assert "Starting: Test hats.io.validation.is_valid_collection." in captured - assert "Validating collection at path" in captured - assert "Validating catalog at path" in captured - assert "Result: PASSED" in captured + captured_logs = caplog.text + captured_stdout = capsys.readouterr().out + assert "Starting: Test hats.io.validation.is_valid_collection." in captured_stdout + assert "Validating collection at path" in captured_logs + assert "Validating catalog at path" in captured_logs + assert "Result: PASSED" in captured_stdout def test_test_num_rows(small_sky_object_catalog, wrong_files_and_rows_dir, tmp_path):