ingest_mdir: fix --list-tests handling

There are 2 problems with the --list-tests command:

- The arguments --tree and the --patch/--mdir group are marked as
  required=True, forcing argparse to demand them even when they aren't
  needed (like for --list-tests).

- The main() function tries to access args.tree before checking if
  --list-tests was specified, which would cause a crash even if the
  parser requirement was removed. This problem is masked by the first
  one, so it makes sense to handle them together.

$ ./ingest_mdir.py --list-tests # should have succeeded
ingest_mdir.py: error: the following arguments are required: --tree

$ ./ingest_mdir.py --tree dummy --list-tests
ingest_mdir.py: error: one of the arguments --patch --mdir is required

$ ./ingest_mdir.py --tree dummy --patch dummy2 --list-tests # only this variant succeeds

Remove the required=True from the patch_arg group and the --tree
argument, and add manual handling for them if --list-tests wasn't
specified.

Also, move the args.tree dereference after the list_tests check and
the manual verification that the argument was provided.

Signed-off-by: Vladimir Oltean <[email protected]>

Author: vladimiroltean

ingest_mdir.py

@@ -42,11 +42,11 @@
 
 parser = argparse.ArgumentParser()
 
-patch_arg = parser.add_mutually_exclusive_group(required=True)
+patch_arg = parser.add_mutually_exclusive_group()
 patch_arg.add_argument('--patch', help='path to the patch file')
 patch_arg.add_argument('--mdir', help='path to the directory with the patches')
 
-parser.add_argument('--tree', required=True, help='path to the tree to test on')
+parser.add_argument('--tree', help='path to the tree to test on')
 parser.add_argument('--tree-name', help='the tree name to expect')
 parser.add_argument('--result-dir',
                     help='the directory where results will be generated')
@@ -286,15 +286,23 @@ def main():
         YELLOW = ''
         RESET = ''
 
-    args.tree = os.path.abspath(args.tree)
-
     if args.test:
         config.set('tests', 'include', ','.join(args.test))
 
+    # Handle --list-tests first, as it needs no other arguments
     if args.list_tests:
         list_tests(args, config)
         return
 
+    # If not listing tests, manually validate the required arguments
+    if not args.tree:
+        parser.error("the following arguments are required: --tree")
+
+    if not args.patch and not args.mdir:
+        parser.error("one of the arguments --patch --mdir is required")
+
+    args.tree = os.path.abspath(args.tree)
+
     if args.result_dir is None:
         args.result_dir = tempfile.mkdtemp()
     print("Saving output and logs to:", args.result_dir)