Rework test runners to centralized workflow (#2996)

Author: nateprewitt

scripts/ci/run-crt-tests

@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+# Don't run tests from the root repo dir.
+# We want to ensure we're importing from the installed
+# binary package not from the CWD.
+
+import os
+import sys
+from subprocess import check_call
+
+_dname = os.path.dirname
+
+REPO_ROOT = _dname(_dname(_dname(os.path.abspath(__file__))))
+os.chdir(os.path.join(REPO_ROOT, "tests"))
+
+
+def run(command):
+    return check_call(command, shell=True)
+
+
+try:
+    import awscrt
+except ImportError:
+    print("MISSING DEPENDENCY: awscrt must be installed to run the crt tests.")
+    sys.exit(1)
+
+run(f'{REPO_ROOT}/scripts/ci/run-tests unit/ functional/')

scripts/ci/run-integ-tests

@@ -9,12 +9,11 @@ from subprocess import check_call
 _dname = os.path.dirname
 
 REPO_ROOT = _dname(_dname(_dname(os.path.abspath(__file__))))
-os.chdir(os.path.join(REPO_ROOT, 'tests'))
+os.chdir(os.path.join(REPO_ROOT, "tests"))
 
 
 def run(command):
     return check_call(command, shell=True)
 
 
-run('nosetests --with-xunit --cover-erase --with-coverage '
-    '--cover-package boto3 --cover-xml -v integration')
+run(f"{REPO_ROOT}/scripts/ci/run-tests --with-cov integration")

scripts/ci/run-tests

@@ -3,19 +3,58 @@
 # We want to ensure we're importing from the installed
 # binary package not from the CWD.
 
+import argparse
 import os
-import sys
 from subprocess import check_call
 
 _dname = os.path.dirname
 
 REPO_ROOT = _dname(_dname(_dname(os.path.abspath(__file__))))
-os.chdir(os.path.join(REPO_ROOT, 'tests'))
+PACKAGE = "boto3"
+os.chdir(os.path.join(REPO_ROOT, "tests"))
 
-args = sys.argv[1:]
-if not args:
-    args = ['unit/', 'functional/']
 
-check_call(['nosetests', '--with-coverage', '--cover-erase',
-            '--cover-package', 'boto3', '--with-xunit', '--cover-xml',
-            '-v'] + args)
+def run(command):
+    return check_call(command, shell=True)
+
+
+def process_args(args):
+    runner = args.test_runner
+    test_args = ''
+    if args.with_cov:
+        test_args += (
+            f"--with-xunit --cover-erase --with-coverage "
+            f"--cover-package {PACKAGE} --cover-xml -v "
+        )
+    dirs = " ".join(args.test_dirs)
+
+    return runner, test_args, dirs
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "test_dirs",
+        default=["unit/", "functional/"],
+        nargs="*",
+        help="One or more directories containing tests.",
+    )
+    parser.add_argument(
+        "-r",
+        "--test-runner",
+        default="nosetests",
+        help="Test runner to execute tests. Defaults to nose.",
+    )
+    parser.add_argument(
+        "-c",
+        "--with-cov",
+        default=False,
+        action="store_true",
+        help="Run default test-runner with code coverage enabled.",
+    )
+    raw_args = parser.parse_args()
+    test_runner, test_args, test_dirs = process_args(raw_args)
+
+    cmd = f"{test_runner} {test_args}{test_dirs}"
+    print(f"Running {cmd}...")
+    run(cmd)