Treat ValueError as known user errors

Author: tomwhite

tests/test_bcftools_validation.py

@@ -175,4 +175,4 @@ def test_error(tmp_path, args, vcf_name):
     assert bcftools_error.startswith("Error:") or bcftools_error.startswith("[E::")
 
     _, vcztools_error = run_vcztools(f"{args} {vcz_path}", expect_error=True)
-    assert vcztools_error.startswith("Error:")
+    assert "Error:" in vcztools_error

vcztools/cli.py

@@ -31,15 +31,16 @@ def handle_broken_pipe(output):
 
 def handle_exception(func):
     """
-    Handle application exceptions by converting to a ClickException,
-    so the message is written to stderr and a non-zero exit code is set.
+    Handle known application exceptions (ValueError) by converting to
+    a ClickException, so the message is written to stderr and a non-zero exit
+    code is set.
     """
 
     @wraps(func)
     def wrapper(*args, **kwargs):
         try:
             return func(*args, **kwargs)
-        except Exception as e:
+        except ValueError as e:
             raise click.ClickException(e) from e
 
     return wrapper
@@ -222,7 +223,8 @@ def view(
         )
 
     if samples_file:
-        assert not samples, "vcztools does not support combining -s and -S"
+        if samples is not None:
+            raise ValueError("vcztools does not support combining -s and -S")
 
         samples = ""
         exclude_samples_file = samples_file.startswith("^")