Catch filter parsing errors

Author: hwikle-lanl

lib/pavilion/cmd_utils.py

@@ -166,7 +166,10 @@ def arg_filtered_tests(pav_cfg: "PavConfig", args: argparse.Namespace,
     if args.filter is None:
         filter_func = filters.const(True) # Always return True
     else:
-        filter_func = filters.parse_query(args.filter)
+        try:
+            filter_func = filters.parse_query(args.filter)
+        except filters.FilterParseError:
+            raise PavilionError(f"Invalid syntax in filter query: {args.filter}")
 
     order_func, order_asc = filters.get_sort_opts(sort_by, "TEST")
 
@@ -263,7 +266,10 @@ def arg_filtered_series(pav_cfg: config.PavConfig, args: argparse.Namespace,
             if args.filter is None:
                 filter_func = filters.const(True)  # Always return True
             else:
-                filter_func = filters.parse_query(args.filter)
+                try:
+                    filter_func = filters.parse_query(args.filter)
+                except filters.FilterParseError:
+                    raise PavilionError(f"Invalid syntax in filter query: {args.filter}")
 
             found_series = dir_db.select(
                 pav_cfg=pav_cfg,

lib/pavilion/commands/status.py

@@ -7,6 +7,7 @@
 from pavilion import filters
 from pavilion import output
 from pavilion import status_utils
+from pavilion.errors import PavilionError
 from .base_classes import Command
 
 
@@ -53,7 +54,7 @@ def run(self, pav_cfg, args):
         series."""
         try:
             test_paths = cmd_utils.arg_filtered_tests(pav_cfg, args, verbose=self.errfile).paths
-        except ValueError as err:
+        except (ValueError, PavilionError) as err:
             output.fprint(self.errfile, err, color=output.RED)
             return errno.EINVAL