updating the test harness script to have a bit more clearly bifurcated logic. also handling the method for passing the arguments to pytest

scbedd · scbedd · commit a304284e2888 · 2019-08-13T12:11:12.000-07:00
diff --git a/scripts/devops_tasks/setup_execute_tests.py b/scripts/devops_tasks/setup_execute_tests.py
@@ -226,6 +226,32 @@ def collect_tox_coverage_files(targeted_packages):
         shutil.move(source, dest)
 
 
+def execute_global_install_and_test(parsed_args, targeted_packages, extended_pytest_args):
+    if args.runtype == "setup" or args.runtype == "all":
+        prep_tests(targeted_packages, args.python_version)
+
+    if args.mark_arg:
+        extended_pytest_args.extend(["-m", "\"{}\"".format(args.mark_arg)])
+
+    if args.runtype == "execute" or args.runtype == "all":
+        run_tests(
+            targeted_packages,
+            args.python_version,
+            args.test_results,
+            extended_pytest_args,
+        )
+
+
+def execute_tox_harness(parsed_args, targeted_packages, extended_pytest_args):
+    if args.wheel_dir:
+        os.environ["PREBUILT_WHEEL_DIR"] = args.wheel_dir
+
+    if args.mark_arg:
+        extended_pytest_args.extend(["-m", "'{}'".format(args.mark_arg)])
+
+    prep_and_run_tox(targeted_packages, args.tox_env, extended_pytest_args)
+
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
         description="Install Dependencies, Install Packages, Test Azure Packages, Called from DevOps YAML Pipeline"
@@ -306,29 +332,15 @@ def collect_tox_coverage_files(targeted_packages):
         target_dir = root_dir
 
     targeted_packages = process_glob_string(args.glob_string, target_dir)
-    test_results_arg = []
+    extended_pytest_args = []
 
+    # common argument handling
     if args.disablecov:
-        test_results_arg.append("--no-cov")
+        extended_pytest_args.append("--no-cov")
     else:
-        test_results_arg.extend(["--durations=10", "--cov", "--cov-report="])
-
-    if args.mark_arg:
-        test_results_arg.extend(["-m", "'{}'".format(args.mark_arg)])
-
-    if args.wheel_dir:
-        os.environ["PREBUILT_WHEEL_DIR"] = args.wheel_dir
+        extended_pytest_args.extend(["--durations=10", "--cov", "--cov-report="])
 
     if args.runtype != "none":
-        if args.runtype == "setup" or args.runtype == "all":
-            prep_tests(targeted_packages, args.python_version)
-
-        if args.runtype == "execute" or args.runtype == "all":
-            run_tests(
-                targeted_packages,
-                args.python_version,
-                args.test_results,
-                test_results_arg,
-            )
+        execute_tox_harness(args, targeted_packages, extended_pytest_args)
     else:
-        prep_and_run_tox(targeted_packages, args.tox_env, test_results_arg)
+        execute_global_install_and_test(args, targeted_packages, extended_pytest_args)
