Fix DeprecationWarning: Nesting argument groups is deprecated.

This was making the pytest output very noisy.

Also update the help test as the `--cid-*` options work for both the Docker and
Podman container engines.

Author: mr-c

cwltool/argparser.py

@@ -415,8 +415,8 @@ def arg_parser() -> argparse.ArgumentParser:
         dest="rm_container",
     )
 
-    cidgroup = container_group.add_argument_group(
-        "Recording the Docker container identifier into a file"
+    cidgroup = parser.add_argument_group(
+        "Recording the software container identifier into a file"
     )
     cidgroup.add_argument(
         # Disabled as containerid is now saved by default
@@ -430,15 +430,15 @@ def arg_parser() -> argparse.ArgumentParser:
     cidgroup.add_argument(
         "--cidfile-dir",
         type=str,
-        help="Store the Docker container ID into a file in the specified directory.",
+        help="Store the software container ID into a file in the specified directory.",
         default=None,
         dest="cidfile_dir",
     )
 
     cidgroup.add_argument(
         "--cidfile-prefix",
         type=str,
-        help="Specify a prefix to the container ID filename. "
+        help="Specify a prefix to the software container ID filename. "
         "Final file name will be followed by a timestamp. "
         "The default is no prefix.",
         default=None,