Simplify TestKit glue + add option to choose interpreter verion

Author: robsdedude

testkit/_common.py

@@ -0,0 +1,17 @@
+import os
+import subprocess
+import sys
+
+
+TEST_BACKEND_VERSION = os.getenv("TEST_BACKEND_VERSION", "python")
+
+
+def run(args, env=None):
+    return subprocess.run(
+        args, universal_newlines=True, stdout=sys.stdout, stderr=sys.stderr,
+        check=True, env=env
+    )
+
+
+def run_python(args, env=None):
+    run([TEST_BACKEND_VERSION, "-W", "error", *args], env=env)

testkit/backend.py

@@ -19,12 +19,12 @@
 
 
 import os
-import subprocess
-import sys
+
+from _common import run_python
 
 
 if __name__ == "__main__":
-    cmd = ["python", "-W", "error", "-m", "testkitbackend"]
+    cmd = ["-m", "testkitbackend"]
     if "TEST_BACKEND_SERVER" in os.environ:
         cmd.append(os.environ["TEST_BACKEND_SERVER"])
-    subprocess.check_call(cmd, stdout=sys.stdout, stderr=sys.stderr)
+    run_python(cmd)

testkit/build.py

@@ -24,17 +24,11 @@
 """
 
 
-import subprocess
-import sys
-
-
-def run(args, env=None):
-    subprocess.run(args, universal_newlines=True, stdout=sys.stdout,
-                   stderr=sys.stderr, check=True, env=env)
+from _common import run_python
 
 
 if __name__ == "__main__":
-    run(["python", "setup.py", "build"])
-    run(["python", "-m", "pip", "install", "-U", "pip"])
-    run(["python", "-m", "pip", "install", "-Ur",
-         "testkitbackend/requirements.txt"])
+    run_python(["setup.py", "build"])
+    run_python(["-m", "pip", "install", "-U", "pip"])
+    run_python(["-m", "pip", "install", "-Ur",
+                "testkitbackend/requirements.txt"])

testkit/integration.py

@@ -18,13 +18,8 @@
 # limitations under the License.
 
 
-import subprocess
-
-
-def run(args):
-    subprocess.run(
-        args, universal_newlines=True, stderr=subprocess.STDOUT, check=True)
+from _common import run_python
 
 
 if __name__ == "__main__":
-    run(["python", "-W", "error", "-m", "tox", "-f", "integration"])
+    run_python(["-m", "tox", "-f", "integration"])

testkit/unittests.py

@@ -18,13 +18,8 @@
 # limitations under the License.
 
 
-import subprocess
-
-
-def run(args):
-    subprocess.run(
-        args, universal_newlines=True, stderr=subprocess.STDOUT, check=True)
+from _common import run_python
 
 
 if __name__ == "__main__":
-    run(["python", "-W", "error", "-m", "tox", "-f", "unit"])
+    run_python(["-m", "tox", "-f", "unit"])