update description

Author: braingram

asdf/_commands/validate.py

@@ -15,7 +15,10 @@ def setup_arguments(cls, subparsers):
         parser = subparsers.add_parser(
             "validate",
             help="Validates an ASDF file.",
-            description="validates \n - against all tagged schemas (and optionally a custom schema) \n - blocks with stored checksums (can be disabled)",
+            description=(
+                "Validates tree against all tagged schemas (and optionally a custom schema) "
+                "and blocks with stored checksums."
+            ),
         )
 
         parser.add_argument("filename", help="path to ASDF file")
@@ -39,14 +42,17 @@ def run(cls, args):
         validate(args.filename, args.custom_schema, args.skip_block_validation)
 
 
-def validate(filename, custom_schema, skip_checksums):
+def validate(filename, custom_schema, skip_block_validation):
     # if we are skipping checksums we can lazy load, otherwise don't
     with asdf.open(
-        filename, custom_schema=custom_schema, validate_checksums=not skip_checksums, lazy_load=skip_checksums
+        filename,
+        custom_schema=custom_schema,
+        validate_checksums=not skip_block_validation,
+        lazy_load=skip_block_validation,
     ) as af:  # noqa: F841
         msg = f"{filename} is valid"
         if custom_schema:
             msg += f", conforms to {custom_schema}"
-        if not skip_checksums:
-            msg += ", and block checksums match"
+        if not skip_block_validation:
+            msg += ", and block checksums match contents"
         print(msg)

asdf/_tests/commands/test_validate.py

@@ -72,13 +72,13 @@ def test_invalid(invalid_file_path):
 
 def test_custom_schema(valid_file_path, custom_schema_path):
     with pytest.raises(asdf.ValidationError):
-        main.main_from_args(["validate", str(valid_file_path), "--custom_schema", str(custom_schema_path)])
+        main.main_from_args(["validate", str(valid_file_path), "--custom-schema", str(custom_schema_path)])
 
 
 def test_block_checksum(bad_blocks_file_path):
     with pytest.raises(ValueError, match="does not match given checksum"):
         main.main_from_args(["validate", str(bad_blocks_file_path)])
 
 
-def test_skip_checksums(bad_blocks_file_path):
-    assert main.main_from_args(["validate", str(bad_blocks_file_path), "--skip_checksums"]) == 0
+def test_skip_block_validation(bad_blocks_file_path):
+    assert main.main_from_args(["validate", str(bad_blocks_file_path), "--skip-block-validation"]) == 0