From dee24acb12f2222f55af7df9503e93b2462a13fa Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Thu, 15 Aug 2024 19:33:19 +0000
Subject: [PATCH] Clean out env passed to wasmbrowsertest in TestWasm
---
conn_test.go | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/conn_test.go b/conn_test.go
index be7c998..b4d57f2 100644
--- a/conn_test.go
+++ b/conn_test.go
@@ -364,7 +364,7 @@ func TestWasm(t *testing.T) {
defer cancel()
cmd := exec.CommandContext(ctx, "go", "test", "-exec=wasmbrowsertest", ".", "-v")
- cmd.Env = append(os.Environ(), "GOOS=js", "GOARCH=wasm", fmt.Sprintf("WS_ECHO_SERVER_URL=%v", s.URL))
+ cmd.Env = append(cleanEnv(os.Environ()), "GOOS=js", "GOARCH=wasm", fmt.Sprintf("WS_ECHO_SERVER_URL=%v", s.URL))
b, err := cmd.CombinedOutput()
if err != nil {
@@ -372,6 +372,18 @@ func TestWasm(t *testing.T) {
}
}
+func cleanEnv(env []string) (out []string) {
+ for _, e := range env {
+ // Filter out GITHUB envs and anything with token in it,
+ // especially GITHUB_TOKEN in CI as it breaks TestWasm.
+ if strings.HasPrefix(e, "GITHUB") || strings.Contains(e, "TOKEN") {
+ continue
+ }
+ out = append(out, e)
+ }
+ return out
+}
+
func assertCloseStatus(exp websocket.StatusCode, err error) error {
if websocket.CloseStatus(err) == -1 {
return fmt.Errorf("expected websocket.CloseError: %T %v", err, err)
--
GitLab