Fix tests

Author: mdboom

bench_runner/__main__.py

@@ -1,4 +1,5 @@
 import importlib
+import os
 import sys
 
 
@@ -25,6 +26,15 @@
 }
 
 if __name__ == "__main__":
+    # This lets pytest-cov collect coverage data in a subprocess
+    if "COV_CORE_SOURCE" in os.environ:
+        try:
+            from pytest_cov.embed import init
+
+            init()
+        except Exception:
+            sys.stderr.write("pytest-cov: Failed to setup subprocess coverage.")
+
     command = len(sys.argv) >= 2 and sys.argv[1] or ""
 
     if command not in COMMANDS:
@@ -37,5 +47,5 @@
         sys.exit(1)
 
     sys.argv = [sys.argv[0], *sys.argv[2:]]
-    mod = importlib.import_module(f"bench_runner.scripts.{command}")
+    mod = importlib.import_module(f".{command}", "bench_runner.scripts")
     mod.main()

bench_runner/scripts/workflow.py

@@ -398,13 +398,4 @@ def main():
 
 
 if __name__ == "__main__":
-    # This lets pytest-cov collect coverage data in a subprocess
-    if "COV_CORE_SOURCE" in os.environ:
-        try:
-            from pytest_cov.embed import init
-
-            init()
-        except Exception:
-            sys.stderr.write("pytest-cov: Failed to setup subprocess coverage.")
-
     main()

tests/test_run_benchmarks.py

@@ -83,7 +83,9 @@ def test_run_benchmarks(benchmarks_checkout, monkeypatch):
     subprocess.check_call(
         [
             venv_python,
-            run_benchmarks.__file__,
+            "-m",
+            "bench_runner",
+            "run_benchmarks",
             "benchmark",
             sys.executable,
             "python",
@@ -132,7 +134,9 @@ def test_run_benchmarks(benchmarks_checkout, monkeypatch):
     returncode = subprocess.call(
         [
             venv_python,
-            run_benchmarks.__file__,
+            "-m",
+            "bench_runner",
+            "run_benchmarks",
             "benchmark",
             sys.executable,
             "python",
@@ -164,7 +168,9 @@ def test_run_benchmarks_flags(benchmarks_checkout):
     subprocess.check_call(
         [
             venv_python,
-            run_benchmarks.__file__,
+            "-m",
+            "bench_runner",
+            "run_benchmarks",
             "benchmark",
             sys.executable,
             "python",