diff --git a/internal/relay/client_managed_runtime_test.go b/internal/relay/client_managed_runtime_test.go index 161aa04d3..57abe703a 100644 --- a/internal/relay/client_managed_runtime_test.go +++ b/internal/relay/client_managed_runtime_test.go @@ -222,16 +222,17 @@ func managedRelayWorkspaceRoots(t *testing.T) (string, string) { t.Fatal("resolve runtime caller for managed relay test") } pulseRoot := filepath.Clean(filepath.Join(filepath.Dir(currentFile), "..", "..")) - pulseProRoot := os.Getenv("PULSE_REPO_ROOT_PULSE_PRO") - if pulseProRoot == "" { + pulseProRoot := strings.TrimSpace(os.Getenv("PULSE_REPO_ROOT_PULSE_PRO")) + hasExplicitPulseProRoot := pulseProRoot != "" + if !hasExplicitPulseProRoot { pulseProRoot = filepath.Join(filepath.Dir(pulseRoot), "pulse-pro") } pulseProRelayDir := filepath.Join(pulseProRoot, "relay-server") if _, err := os.Stat(filepath.Join(pulseProRelayDir, "main.go")); err != nil { - if os.Getenv("GITHUB_ACTIONS") == "true" && os.Getenv("PULSE_REPO_ROOT_PULSE_PRO") == "" { - t.Skipf("managed relay runtime proof requires sibling pulse-pro relay-server; skipping in GitHub Actions without PULSE_REPO_ROOT_PULSE_PRO override: %v", err) + if hasExplicitPulseProRoot { + t.Fatalf("managed relay runtime proof was explicitly configured with PULSE_REPO_ROOT_PULSE_PRO=%s, but relay-server is unavailable: %v", pulseProRoot, err) } - t.Fatalf("managed relay runtime proof requires sibling pulse-pro relay-server at %s: %v", pulseProRelayDir, err) + t.Skipf("managed relay runtime proof requires sibling pulse-pro relay-server; skipping single-repository checkout (set PULSE_REPO_ROOT_PULSE_PRO to enforce): %v", err) } return pulseRoot, pulseProRelayDir } diff --git a/tests/migration/v5_real_exchange_upgrade_test.go b/tests/migration/v5_real_exchange_upgrade_test.go index 54b832328..3415d3bef 100644 --- a/tests/migration/v5_real_exchange_upgrade_test.go +++ b/tests/migration/v5_real_exchange_upgrade_test.go @@ -13,6 +13,7 @@ import ( "os/exec" "path/filepath" "runtime" + "strings" "testing" "time" @@ -200,16 +201,17 @@ func managedLicenseServerDir(t *testing.T) string { t.Fatal("resolve caller for managed license server test") } pulseRoot := filepath.Clean(filepath.Join(filepath.Dir(currentFile), "..", "..")) - pulseProRoot := os.Getenv("PULSE_REPO_ROOT_PULSE_PRO") - if pulseProRoot == "" { + pulseProRoot := strings.TrimSpace(os.Getenv("PULSE_REPO_ROOT_PULSE_PRO")) + hasExplicitPulseProRoot := pulseProRoot != "" + if !hasExplicitPulseProRoot { pulseProRoot = filepath.Join(filepath.Dir(pulseRoot), "pulse-pro") } licenseServerDir := filepath.Join(pulseProRoot, "license-server") if _, err := os.Stat(filepath.Join(licenseServerDir, "main.go")); err != nil { - if os.Getenv("GITHUB_ACTIONS") == "true" && os.Getenv("PULSE_REPO_ROOT_PULSE_PRO") == "" { - t.Skipf("managed license-server proof requires sibling pulse-pro license-server; skipping in GitHub Actions without PULSE_REPO_ROOT_PULSE_PRO override: %v", err) + if hasExplicitPulseProRoot { + t.Fatalf("managed license-server proof was explicitly configured with PULSE_REPO_ROOT_PULSE_PRO=%s, but license-server is unavailable: %v", pulseProRoot, err) } - t.Fatalf("managed license-server proof requires sibling pulse-pro license-server at %s: %v", licenseServerDir, err) + t.Skipf("managed license-server proof requires sibling pulse-pro license-server; skipping single-repository checkout (set PULSE_REPO_ROOT_PULSE_PRO to enforce): %v", err) } return licenseServerDir }