From fb4bdb64e068fe64d0606b85062610392f71a5bd Mon Sep 17 00:00:00 2001 From: Zxilly Date: Thu, 5 Sep 2024 23:11:52 +0800 Subject: [PATCH 1/2] net/http: only disable fetch in test --- src/net/http/roundtrip_js.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/net/http/roundtrip_js.go b/src/net/http/roundtrip_js.go index 04c241eb4c006a..378c167d02a436 100644 --- a/src/net/http/roundtrip_js.go +++ b/src/net/http/roundtrip_js.go @@ -12,8 +12,8 @@ import ( "io" "net/http/internal/ascii" "strconv" - "strings" "syscall/js" + "testing" ) var uint8Array = js.Global().Get("Uint8Array") @@ -53,8 +53,7 @@ var jsFetchMissing = js.Global().Get("fetch").IsUndefined() // // TODO(go.dev/issue/60810): See if it's viable to test the Fetch API // code path. -var jsFetchDisabled = js.Global().Get("process").Type() == js.TypeObject && - strings.HasPrefix(js.Global().Get("process").Get("argv0").String(), "node") +var jsFetchDisabled = testing.Testing() // RoundTrip implements the [RoundTripper] interface using the WHATWG Fetch API. func (t *Transport) RoundTrip(req *Request) (*Response, error) { From 140640b4148da9e390b31c2e885dfa32aed70d86 Mon Sep 17 00:00:00 2001 From: Zxilly Date: Fri, 6 Sep 2024 13:07:27 +0800 Subject: [PATCH 2/2] add --- lib/wasm/wasm_exec_node.js | 10 ++++++++++ src/net/http/roundtrip_js.go | 5 ++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/wasm/wasm_exec_node.js b/lib/wasm/wasm_exec_node.js index dd65b19867dcf4..1c303d2bbb2a51 100644 --- a/lib/wasm/wasm_exec_node.js +++ b/lib/wasm/wasm_exec_node.js @@ -21,6 +21,16 @@ globalThis.crypto ??= require("crypto"); require("./wasm_exec"); +// Disable fetch API in tests so that +// RoundTrip ends up talking over the same fake +// network the HTTP servers currently use in +// various tests and examples. +// See net/http/roundtrip_js.go. +// See go.dev/issue/57613. +if (process.argv[2].endsWith(".test")) { + globalThis["JSFetchDisabledInTest"] = true; +} + const go = new Go(); go.argv = process.argv.slice(2); go.env = Object.assign({ TMPDIR: require("os").tmpdir() }, process.env); diff --git a/src/net/http/roundtrip_js.go b/src/net/http/roundtrip_js.go index 378c167d02a436..ca21f65c32dccc 100644 --- a/src/net/http/roundtrip_js.go +++ b/src/net/http/roundtrip_js.go @@ -13,7 +13,6 @@ import ( "net/http/internal/ascii" "strconv" "syscall/js" - "testing" ) var uint8Array = js.Global().Get("Uint8Array") @@ -47,13 +46,13 @@ const jsFetchRedirect = "js.fetch:redirect" var jsFetchMissing = js.Global().Get("fetch").IsUndefined() // jsFetchDisabled controls whether the use of Fetch API is disabled. -// It's set to true when we detect we're running in Node.js, so that +// It's set to true when we detect we're running in test, so that // RoundTrip ends up talking over the same fake network the HTTP servers // currently use in various tests and examples. See go.dev/issue/57613. // // TODO(go.dev/issue/60810): See if it's viable to test the Fetch API // code path. -var jsFetchDisabled = testing.Testing() +var jsFetchDisabled = !js.Global().Get("JSFetchDisabledInTest").IsUndefined() // RoundTrip implements the [RoundTripper] interface using the WHATWG Fetch API. func (t *Transport) RoundTrip(req *Request) (*Response, error) {