change tests and update materialization error handling

Author: ArturU043

servicex_analysis_utils/materialization.py

@@ -48,7 +48,7 @@ def to_awk(deliver_dict, dask=False, iterator=False, **kwargs):
     """
 
     if not deliver_dict:
-        raise ValueError("Input dict from servicex.deliver cannot be empty.")
+        raise RuntimeError("Input dict from servicex.deliver cannot be empty.")
 
     awk_arrays = {}
 
@@ -66,7 +66,7 @@ def to_awk(deliver_dict, dask=False, iterator=False, **kwargs):
             # ServiceX supports only root/parquet in transformed files
         else:
             raise RuntimeError(
-                f"Unsupported delivered format: '{paths[0]}'. Must be R .root or Parquet (.parquet, .pq)"
+                f"Unsupported delivered format: '{paths[0]}'. Must be .root or Parquet (.parquet, .pq)"
             )
 
         try:

tests/test_materialization.py

@@ -155,23 +155,24 @@ def test_unsupported_file_format():
     fake_paths = {"fake-Sample": ["invalid_file.txt"]}
     # match is regex-level
     with pytest.raises(
-        ValueError,
-        match=r"Unsupported file format: 'invalid_file.txt'\. Files must be ROOT \(.*\) or Parquet \(.*\)",
+        RuntimeError,
+        match=r"Unsupported delivered format: 'invalid_file\.txt'\. Must be \.root or Parquet \(\.parquet, \.pq\)",
     ):
         to_awk(fake_paths)
 
 
 def test_empty_deliver_dict():
     empty_dict = {}
     with pytest.raises(
-        ValueError, match="Input dict from servicex.deliver cannot be empty."
+        RuntimeError, match="Input dict from servicex.deliver cannot be empty."
     ):
         to_awk(empty_dict)
 
 
 def test_deliver_dict_empty_paths():
     empty_dict = {"empty-Sample": []}
     with pytest.raises(
-        ValueError, match="ServiceX result path list for empty-Sample cannot be empty."
+        RuntimeError,
+        match="Delivered result file path list for empty-Sample is empty.",
     ):
         to_awk(empty_dict)