smoketests: Allow to skip tests requiring dotnet (#1726)

Author: kim

smoketests/__init__.py

@@ -31,6 +31,9 @@
 
 # this is set to true when the --docker flag is passed to the cli
 HAVE_DOCKER = False
+# this is set to true when the --skip-dotnet flag is not passed to the cli,
+# and a dotnet installation is detected
+HAVE_DOTNET = False
 
 # we need to late-bind the output stream to allow unittests to capture stdout/stderr.
 class CapturableHandler(logging.StreamHandler):
@@ -138,21 +141,6 @@ def run_cmd(*args, capture_stderr=True, check=True, full_output=False, cmd_name=
 def spacetime(*args, **kwargs):
     return run_cmd(SPACETIME_BIN, *args, cmd_name="spacetime", **kwargs)
 
-
-def _check_for_dotnet() -> bool:
-    try:
-        version = run_cmd("dotnet", "--version", log=False).strip()
-        if int(version.split(".")[0]) < 8:
-            logging.info(f"dotnet version {version} not high enough (< 8.0), skipping dotnet smoketests")
-            return False
-    except Exception as e:
-        raise e
-        return False
-    return True
-
-HAVE_DOTNET = _check_for_dotnet()
-
-
 class Smoketest(unittest.TestCase):
     MODULE_CODE = TEMPLATE_LIB_RS
     AUTOPUBLISH = True

smoketests/__main__.py

@@ -3,13 +3,11 @@
 import subprocess
 import unittest
 import argparse
-from tempfile import TemporaryDirectory
-from pathlib import Path
 import os
 import re
 import fnmatch
 import json
-from . import TEST_DIR, STDB_DIR, STDB_CONFIG, build_template_target
+from . import TEST_DIR, build_template_target
 import smoketests
 import logging
 
@@ -23,6 +21,16 @@ def check_docker():
         print("Docker container not found, is SpacetimeDB running?")
         exit(1)
 
+def check_dotnet() -> bool:
+    try:
+        version = smoketests.run_cmd("dotnet", "--version", log=False).strip()
+        if int(version.split(".")[0]) < 8:
+            logging.info(f"dotnet version {version} not high enough (< 8.0), skipping dotnet smoketests")
+            return False
+    except Exception:
+        return False
+    return True
+
 class ExclusionaryTestLoader(unittest.TestLoader):
     def __init__(self, excludelist=()):
         super().__init__()
@@ -49,6 +57,7 @@ def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("test", nargs="*", default=tests)
     parser.add_argument("--docker", action="store_true")
+    parser.add_argument("--skip-dotnet", action="store_true", help="ignore tests which require dotnet")
     parser.add_argument("--show-all-output", action="store_true", help="show all stdout/stderr from the tests as they're running")
     parser.add_argument("--parallel", action="store_true", help="run test classes in parallel")
     parser.add_argument("-j", dest='jobs', help="Set number of jobs for parallel test runs. Default is `nproc`", type=int, default=0)
@@ -71,6 +80,12 @@ def main():
         subprocess.Popen(["docker", "logs", "-f", docker_container])
         smoketests.HAVE_DOCKER = True
 
+    if not args.skip_dotnet:
+        smoketests.HAVE_DOTNET = check_dotnet()
+        if not smoketests.HAVE_DOTNET:
+            print("no suitable dotnet installation found")
+            exit(1)
+
     add_prefix = lambda testlist: [TESTPREFIX + test for test in testlist]
     import fnmatch
     excludelist = add_prefix(args.exclude)