Commit fb5279cc authored by Johan Brandhorst's avatar Johan Brandhorst Committed by Brad Fitzpatrick

net/http: fix build errors on js/wasm target

The in-progress WASM port does not yet have sufficient automatic
testing performed against it, so these errors slipped through when
adding the new Fetch API backed http.Roundtripper.

Updates #25506

Change-Id: I84c5832452e3e6067a02d926f67d01aaca66b837
GitHub-Last-Rev: 064062b5fd256e7fce961a13a8ac00a135f60221
GitHub-Pull-Request: golang/go#25714
Reviewed-on: https://go-review.googlesource.com/116076Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
parent 446d76e6
......@@ -12,13 +12,13 @@ import (
"io"
"io/ioutil"
"os"
"path"
"strconv"
"strings"
"syscall/js"
)
// RoundTrip implements the RoundTripper interface using the WHATWG Fetch API.
func (*Transport) RoundTrip(req *Request) (*Response, error) {
func (t *Transport) RoundTrip(req *Request) (*Response, error) {
if useFakeNetwork() {
return t.roundTrip(req)
}
......@@ -134,10 +134,12 @@ func (*Transport) RoundTrip(req *Request) (*Response, error) {
}
}
var errClosed = errors.New("net/http: reader is closed")
// useFakeNetwork is used to determine whether the request is made
// by a test and should be made to use the fake in-memory network.
func useFakeNetwork() bool {
return len(os.Args) > 0 && path.Base(os.Args[0]) == "node"
return len(os.Args) > 0 && strings.HasSuffix(os.Args[0], ".test")
}
// streamReader implements an io.ReadCloser wrapper for ReadableStream.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment