From d83223d719f603e9462cab5f32c9fa720648a0c1 Mon Sep 17 00:00:00 2001 From: Chase Sterling Date: Mon, 14 Jul 2025 22:32:13 -0400 Subject: [PATCH 1/2] Pass -server argument to tests --- sdk/tests/cmd/datastar-sdk-tests/main.go | 4 ---- sdk/tests/testdata.go | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sdk/tests/cmd/datastar-sdk-tests/main.go b/sdk/tests/cmd/datastar-sdk-tests/main.go index dcdfbb2b9..7a6bf851e 100644 --- a/sdk/tests/cmd/datastar-sdk-tests/main.go +++ b/sdk/tests/cmd/datastar-sdk-tests/main.go @@ -11,7 +11,6 @@ import ( func main() { var ( - serverURL = flag.String("server", "http://localhost:7331", "Test server URL") verbose = flag.Bool("v", false, "Verbose output") testType = flag.String("type", "all", "Test type: get, post, or all") help = flag.Bool("h", false, "Show help") @@ -31,9 +30,6 @@ func main() { os.Exit(0) } - // Set environment variable for tests - os.Setenv("TEST_SERVER_URL", *serverURL) - // Create a testing.M to run tests var tests []testing.InternalTest diff --git a/sdk/tests/testdata.go b/sdk/tests/testdata.go index 665b714b6..64f7393de 100644 --- a/sdk/tests/testdata.go +++ b/sdk/tests/testdata.go @@ -3,6 +3,7 @@ package sdktests import ( "bytes" "embed" + "flag" "fmt" "io" "io/fs" @@ -23,12 +24,10 @@ import ( //go:embed golden var testData embed.FS -var serverURL = os.Getenv("TEST_SERVER_URL") +var serverURL string func init() { - if serverURL == "" { - serverURL = "http://localhost:7331" - } + flag.StringVar(&serverURL, "server", "http://localhost:7331", "Test server URL") } // TestSSEGetEndpoints is an exported version of the GET endpoint tests From 23d792497cfbde2d8770bb1349afed2c7aa83f44 Mon Sep 17 00:00:00 2001 From: Chase Sterling Date: Mon, 14 Jul 2025 22:32:34 -0400 Subject: [PATCH 2/2] Fix sdk tests on Windows --- sdk/tests/testdata.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk/tests/testdata.go b/sdk/tests/testdata.go index 64f7393de..c29b4c2b6 100644 --- a/sdk/tests/testdata.go +++ b/sdk/tests/testdata.go @@ -10,6 +10,7 @@ import ( "net/http" "net/url" "os" + "path" "path/filepath" "sort" "strings" @@ -63,8 +64,8 @@ func runTestCases(t *testing.T, embedFS embed.FS, casesDir string, runTest func( for testName := range testCases { testName := testName // capture for closure t.Run(testName, func(t *testing.T) { - inputPath := filepath.Join(casesDir, testName, "input.json") - outputPath := filepath.Join(casesDir, testName, "output.txt") + inputPath := path.Join(casesDir, testName, "input.json") + outputPath := path.Join(casesDir, testName, "output.txt") // Read input from embedded FS inputData, err := embedFS.ReadFile(inputPath)