Fix diagnostics on windows, add e2e test

koordinates · Dec 17, 2024 · 5fb1800 · 5fb1800
1 parent dff5a30
commit 5fb1800
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/kart/diagnostics.py b/kart/diagnostics.py
@@ -42,7 +42,7 @@ def print_diagnostics():
     other_info = {
         "now": str(datetime.now()),
         "ppid": os.getppid(),
-        "sid": os.getsid(0),
+        "sid": os.getsid(0) if hasattr(os, "getsid") else None,
         "kart_helper_pid": os.environ.get("KART_HELPER_PID"),
         "pid": os.getpid(),
     }

diff --git a/tests/scripts/e2e-1.ps1 b/tests/scripts/e2e-1.ps1
@@ -87,4 +87,16 @@ finally {
     Remove-Item -Force -Recurse "$TMP_PATH"
 }
 
+try {
+    $env:KART_DIAGNOSTICS = "1"
+    $output = Exec { kart --version } 2>&1
+}
+finally {
+    Remove-Item Env:\KART_DIAGNOSTICS
+}
+if ($output -notcontains "DIAGNOSTICS") {
+    throw "Expected some diagnostics output"
+}
+
+
 Write-Output ">>> E2E Success"
diff --git a/tests/scripts/e2e-1.sh b/tests/scripts/e2e-1.sh
@@ -95,4 +95,10 @@ if kart ext-run "$HERE/ext-run-test.py" throw; then
     exit 1
 fi
 
+# Kart diagnostics
+if [ -z "$(KART_DIAGNOSTICS=1 kart --version 2>&1 | grep DIAGNOSTICS)" ]; then
+  echo "Expected some diagnostics output"
+  exit 1
+fi
+
 { echo -e "\n✅ E2E: Success"; } 2>/dev/null
diff --git a/tests/test_diagnostics.py b/tests/test_diagnostics.py
@@ -0,0 +1,10 @@
+from io import StringIO
+import sys
+
+from kart.diagnostics import print_diagnostics
+
+def test_print_diagnostics(monkeypatch):
+	stderr = StringIO()
+	monkeypatch.setattr(sys, "stderr", stderr)
+	print_diagnostics()
+	assert "DIAGNOSTICS" in stderr.getvalue()