Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions js/modules/k6/http/response_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -390,4 +390,15 @@ func TestResponse(t *testing.T) {
assertRequestMetricsEmitted(t, metrics.GetBufferedSamples(samples), "GET", sr("HTTPBIN_URL/get"), 200, "")
})
})

t.Run("FailedRequestHeadersAndCookiesAssignment", func(t *testing.T) {
_, err := rt.RunString(`
var res = http.get("https://test.k6.i", { throw: false });
res.headers["custom-key"] = "custom-value";
if (res.headers["custom-key"] !== "custom-value") {
throw new Error("Failed to assign to headers on failed request");
}
`)
assert.NoError(t, err)
})
}
7 changes: 6 additions & 1 deletion lib/netext/httpext/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,12 @@ func MakeRequest(ctx context.Context, state *lib.State, preq *ParsedHTTPRequest)
transport = ntlmssp.Negotiator{RoundTripper: transport}
}

resp := &Response{URL: preq.URL.URL, Request: respReq}
resp := &Response{
URL: preq.URL.URL,
Request: respReq,
Headers: make(map[string]string),
Cookies: make(map[string][]*HTTPCookie),
}
client := http.Client{
Transport: transport,
CheckRedirect: func(req *http.Request, via []*http.Request) error {
Expand Down
45 changes: 45 additions & 0 deletions lib/netext/httpext/request_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,51 @@ func TestMakeRequestTimeoutInTheBegining(t *testing.T) {
}
}

func TestMakeRequestFailedHostInitializesHeadersAndCookies(t *testing.T) {
t.Parallel()
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
samples := make(chan metrics.SampleContainer, 10)
logger := logrus.New()
logger.Level = logrus.DebugLevel
registry := metrics.NewRegistry()
state := &lib.State{
Options: lib.Options{
SystemTags: &metrics.DefaultSystemTagSet,
},
Transport: http.DefaultTransport,
Samples: samples,
Logger: logger,
BufferPool: lib.NewBufferPool(),
BuiltinMetrics: metrics.RegisterBuiltinMetrics(registry),
Tags: lib.NewVUStateTags(registry.RootTagSet()),
}

invalidURL := "https://test.k6.i"
req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, invalidURL, nil)
require.NoError(t, err)

preq := &ParsedHTTPRequest{
Req: req,
URL: &URL{u: req.URL, URL: invalidURL},
Body: new(bytes.Buffer),
Timeout: 10 * time.Second,
TagsAndMeta: state.Tags.GetCurrentValues(),
}

res, err := MakeRequest(ctx, state, preq)
require.NoError(t, err)
require.NotNil(t, res)

assert.NotNil(t, res.Headers, "Headers map should be initialized even for failed requests")
assert.NotNil(t, res.Cookies, "Cookies map should be initialized even for failed requests")

res.Headers["test-key"] = "test-value"
res.Cookies["test-cookie"] = []*HTTPCookie{{Name: "test", Value: "value"}}
assert.Equal(t, "test-value", res.Headers["test-key"])
assert.Equal(t, "test", res.Cookies["test-cookie"][0].Name)
}

func TestMakeRequestRPSLimit(t *testing.T) {
t.Parallel()
var requests int64
Expand Down
4 changes: 3 additions & 1 deletion lib/netext/httpext/response.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ type Response struct {
// NewResponse returns an empty Response instance.
func NewResponse() *Response {
return &Response{
Body: []byte{},
Headers: make(map[string]string),
Cookies: make(map[string][]*HTTPCookie),
Body: []byte{},
}
}

Expand Down
Loading