Commitf8c1853

authored

Merge pull request#469 from coder/mafredri/fix-coverage4

Clean out env passed to wasmbrowsertest in TestWasm

2 parents418f92e +dee24ac commitf8c1853Copy full SHA for f8c1853

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -364,14 +364,26 @@ func TestWasm(t *testing.T) {`
`364`	`364`	`defercancel()`
`365`	`365`
`366`	`366`	`cmd:=exec.CommandContext(ctx,"go","test","-exec=wasmbrowsertest",".","-v")`
`367`		`-cmd.Env=append(os.Environ(),"GOOS=js","GOARCH=wasm",fmt.Sprintf("WS_ECHO_SERVER_URL=%v",s.URL))`
	`367`	`+cmd.Env=append(cleanEnv(os.Environ()),"GOOS=js","GOARCH=wasm",fmt.Sprintf("WS_ECHO_SERVER_URL=%v",s.URL))`
`368`	`368`
`369`	`369`	`b,err:=cmd.CombinedOutput()`
`370`	`370`	`iferr!=nil {`
`371`	`371`	`t.Fatalf("wasm test binary failed: %v:\n%s",err,b)`
`372`	`372`	`}`
`373`	`373`	`}`
`374`	`374`
	`375`	`+funccleanEnv(env []string) (out []string) {`
	`376`	`+for_,e:=rangeenv {`
	`377`	`+// Filter out GITHUB envs and anything with token in it,`
	`378`	`+// especially GITHUB_TOKEN in CI as it breaks TestWasm.`
	`379`	`+ifstrings.HasPrefix(e,"GITHUB")\|\|strings.Contains(e,"TOKEN") {`
	`380`	`+continue`
	`381`	`+}`
	`382`	`+out=append(out,e)`
	`383`	`+}`
	`384`	`+returnout`
	`385`	`+}`
	`386`	`+`
`375`	`387`	`funcassertCloseStatus(exp websocket.StatusCode,errerror)error {`
`376`	`388`	`ifwebsocket.CloseStatus(err)==-1 {`
`377`	`389`	`returnfmt.Errorf("expected websocket.CloseError: %T %v",err,err)`

Comments

(0)