smoketests: Use docker compose logs if compose file is specified

smoketests/__init__.py

@@ -36,6 +36,9 @@
 # and a dotnet installation is detected
 HAVE_DOTNET = False
 
+# default value can be overriden by `--compose-file` flag
+COMPOSE_FILE = "./docker-compose.yml"
+
 # we need to late-bind the output stream to allow unittests to capture stdout/stderr.
 class CapturableHandler(logging.StreamHandler):
 

smoketests/__main__.py

@@ -16,7 +16,7 @@ def check_docker():
     docker_ps = smoketests.run_cmd("docker", "ps", "--format=json")
     docker_ps = (json.loads(line) for line in docker_ps.splitlines())
     for docker_container in docker_ps:
-        if "node" in docker_container["Image"]:
+        if "node" in docker_container["Image"] or "spacetime" in docker_container["Image"]:
             return docker_container["Names"]
     else:
         print("Docker container not found, is SpacetimeDB running?")
@@ -58,6 +58,7 @@ def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("test", nargs="*", default=tests)
     parser.add_argument("--docker", action="store_true")
+    parser.add_argument("--compose-file")
     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")
@@ -94,9 +95,13 @@ def main():
     build_template_target()
 
     if args.docker:
-        docker_container = check_docker()
         # have docker logs print concurrently with the test output
-        subprocess.Popen(["docker", "logs", "-f", docker_container])
+        if args.compose_file:
+            subprocess.Popen(["docker", "compose", "-f", args.compose_file, "logs", "-f"])
+            smoketests.COMPOSE_FILE = args.compose_file
+        else:
+            docker_container = check_docker()
+            subprocess.Popen(["docker", "logs", "-f", docker_container])
         smoketests.HAVE_DOCKER = True
 
     smoketests.new_identity(TEST_DIR / 'config.toml')

smoketests/tests/zz_docker.py

@@ -1,21 +1,22 @@
 import time
-from .. import Smoketest, run_cmd, requires_docker
+from .. import Smoketest, run_cmd, requires_docker, COMPOSE_FILE
 from urllib.request import urlopen
 from .add_remove_index import AddRemoveIndex
 
 
 def restart_docker():
+
     # Behold!
     #
     # You thought stop/start restarts? How wrong. Restart restarts.
-    run_cmd("docker", "compose", "restart")
+    run_cmd("docker", "compose", "-f", COMPOSE_FILE, "restart")
     # The suspense!
     #
     # Wait until compose believes the health probe succeeds.
     #
     # The container may decide to recompile, or grab a coffee at crates.io, or
     # whatever. In any case, restart doesn't mean the server is up yet.
-    run_cmd("docker", "compose", "up", "--no-recreate", "--detach", "--wait-timeout", "60")
+    run_cmd("docker", "compose","-f", COMPOSE_FILE,  "up", "--no-recreate", "--detach", "--wait-timeout", "60")
     # Belts and suspenders!
     #
     # The health probe runs inside the container, but that doesn't mean we can