Improve argument parsing in rpc-tests.py

jnewbery · jnewbery · commit 117e0f2da241 · 2017-02-02T10:16:17.000-05:00
- use --jobs instead of --parallel
- construct passon_args and tests with list comprehension.
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
@@ -132,19 +132,13 @@ def main():
     parser.add_argument('--extended', action='store_true', help='run the extended test suite in addition to the basic tests')
     parser.add_argument('--help', '-h', '-?', action='store_true', help='print help text and exit')
     parser.add_argument('--nozmq', action='store_true', help='do not run the zmq tests')
-    parser.add_argument('--parallel', type=int, default=4, help='how many test scripts to run in parallel. Default=4.')
+    parser.add_argument('--jobs', '-j', type=int, default=4, help='how many test scripts to run in parallel. Default=4.')
     parser.add_argument('--win', action='store_true', help='signal that this is running in a Windows environment and that we should run the tests')
     (args, unknown_args) = parser.parse_known_args()
 
     # Create a set to store arguments and create the passon string
-    tests = set()
-    passon_args = []
-
-    for arg in unknown_args:
-        if arg[:2] == "--":
-            passon_args.append(arg)
-        else:
-            tests.add(arg)
+    tests = set(arg for arg in unknown_args if arg[:2] != "--")
+    passon_args = [arg for arg in unknown_args if arg[:2] == "--"]
 
     # Read config generated by configure.
     config = configparser.ConfigParser()
@@ -176,17 +170,27 @@ def main():
             raise
 
     # Build list of tests
-    test_scripts = BASE_SCRIPTS
-    if enable_zmq:
-        test_scripts += ZMQ_SCRIPTS
-    if args.extended:
-        test_scripts += EXTENDED_SCRIPTS
+    if len(tests) != 0:
+        # Individual tests have been specified. Run specified tests that exist
+        # in the ALL_SCRIPTS list. Accept the name with or without .py extension.
+        test_list = [t for t in ALL_SCRIPTS if
+                (t in tests or re.sub(".py$", "", t) in tests)]
+        if len(test_list) == 0:
+            print("No valid test scripts specified. Check that your test is in one "
+                  "of the test lists in rpc-tests.py or run rpc-tests.py with no arguments to run all tests")
+            sys.exit(0)
 
-    if len(tests) == 0:
-        test_list = test_scripts
     else:
-        test_list = [t for t in test_scripts if 
-                     (t in ALL_SCRIPTS or re.sub(".py$", "", t) in ALL_SCRIPTS)]
+        # No individual tests have been specified. Run base tests, and
+        # optionally ZMQ tests and extended tests.
+        test_list = BASE_SCRIPTS
+        if enable_zmq:
+            test_list += ZMQ_SCRIPTS
+        if args.extended:
+            test_list += EXTENDED_SCRIPTS
+            # TODO: BASE_SCRIPTS and EXTENDED_SCRIPTS are sorted by runtime
+            # (for parallel running efficiency). This combined list will is no
+            # longer sorted.
 
     if args.help:
         # Print help for rpc-tests.py, then print help of the first script and exit.
@@ -199,7 +203,7 @@ def main():
         print(tests)
         sys.exit(0)
 
-    runtests(test_list, config["environment"]["SRCDIR"], config["environment"]["BUILDDIR"], config["environment"]["EXEEXT"], args.parallel, args.coverage, passon_args)
+    runtests(test_list, config["environment"]["SRCDIR"], config["environment"]["BUILDDIR"], config["environment"]["EXEEXT"], args.jobs, args.coverage, passon_args)
 
 def runtests(test_list, src_dir, build_dir, exeext, run_parallel=1, enable_coverage=False, args=[]):
     BOLD = ("","")
