better wait for state CI test

Author: joecorall

ci/test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"log/slog"
@@ -10,6 +11,7 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 	"sync"
 	"time"
@@ -60,8 +62,12 @@ func main() {
 	fmt.Printf("Making sure %d attempt(s) pass\n", rateLimit)
 	runParallelChecks(ips, rateLimit, "http://localhost")
 
-	time.Sleep(cp.StateSaveInterval + cp.StateSaveJitter + (1 * time.Second))
-	runCommand("jq", ".", "tmp/state.json")
+	statePath, err := waitForStateFile(30 * time.Second)
+	if err != nil {
+		slog.Error("State file was not created in time", "err", err)
+		os.Exit(1)
+	}
+	runCommand("jq", ".", statePath)
 
 	fmt.Printf("Making sure attempt #%d causes a redirect to the challenge page\n", rateLimit+1)
 	ensureRedirect(ips, "http://localhost")
@@ -81,7 +87,7 @@ func main() {
 	time.Sleep(10 * time.Second)
 	checkStateReload()
 
-	runCommand("rm", "tmp/state.json")
+	runCommand("rm", "-f", statePath)
 
 }
 
@@ -421,3 +427,26 @@ func testGoogleBotGetsThrough(googleCIDRs []string) {
 	// set things back to normal for other tests
 	runCommand("docker", "compose", "down")
 }
+
+func waitForStateFile(timeout time.Duration) (string, error) {
+	paths := []string{
+		filepath.Join("tmp", "state.json"),
+		filepath.Join("ci", "tmp", "state.json"),
+	}
+
+	deadline := time.Now().Add(timeout)
+	for time.Now().Before(deadline) {
+		for _, p := range paths {
+			info, err := os.Stat(p)
+			if err == nil && !info.IsDir() {
+				return p, nil
+			}
+			if err != nil && !errors.Is(err, os.ErrNotExist) {
+				return "", fmt.Errorf("failed to stat %s: %w", p, err)
+			}
+		}
+		time.Sleep(500 * time.Millisecond)
+	}
+
+	return "", fmt.Errorf("state file not found; checked: %s", strings.Join(paths, ", "))
+}