diff --git a/js/runner.go b/js/runner.go index 56224b2f4f8..081955dbac9 100644 --- a/js/runner.go +++ b/js/runner.go @@ -213,9 +213,9 @@ func (r *Runner) newVU(idLocal, idGlobal uint64, samplesOut chan<- stats.SampleC } if forceHTTP1() { - transport.TLSNextProto = make(map[string]func(string, *tls.Conn) http.RoundTripper) //send over h1 protocol + transport.TLSNextProto = make(map[string]func(string, *tls.Conn) http.RoundTripper) // send over h1 protocol } else { - _ = http2.ConfigureTransport(transport) //send over h2 protocol + _ = http2.ConfigureTransport(transport) // send over h2 protocol } cookieJar, err := cookiejar.New(nil) diff --git a/js/runner_test.go b/js/runner_test.go index 8c3bb81cde0..baae8bdcfb0 100644 --- a/js/runner_test.go +++ b/js/runner_test.go @@ -2075,9 +2075,12 @@ func TestMinIterationDurationIsCancellable(t *testing.T) { } func TestForceHTTP1FeatureEnabledCheckForH1(t *testing.T) { - os.Setenv("GODEBUG", "http2client=0,gctrace=1") - - defer os.Unsetenv("GODEBUG") + err := os.Setenv("GODEBUG", "http2client=0,gctrace=1") + require.NoError(t, err) + defer func() { + err := os.Unsetenv("GODEBUG") + require.NoError(t, err) + }() assert.True(t, forceHTTP1()) @@ -2100,9 +2103,11 @@ func TestForceHTTP1FeatureEnabledCheckForH1(t *testing.T) { `) require.NoError(t, err) - r1.SetOptions(lib.Options{ + err = r1.SetOptions(lib.Options{ InsecureSkipTLSVerify: null.BoolFrom(true), }) + require.NoError(t, err) + registry := metrics.NewRegistry() builtinMetrics := metrics.RegisterBuiltinMetrics(registry) @@ -2126,8 +2131,12 @@ func TestForceHTTP1FeatureEnabledCheckForH1(t *testing.T) { } func TestForceHTTP1FeatureDisabledCheckForH2(t *testing.T) { - os.Setenv("GODEBUG", "test=0") - defer os.Unsetenv("GODEBUG") + err := os.Setenv("GODEBUG", "test=0") + require.NoError(t, err) + defer func() { + err := os.Unsetenv("GODEBUG") + require.NoError(t, err) + }() assert.False(t, forceHTTP1()) @@ -2150,10 +2159,12 @@ func TestForceHTTP1FeatureDisabledCheckForH2(t *testing.T) { `) require.NoError(t, err) - r1.SetOptions(lib.Options{ + err = r1.SetOptions(lib.Options{ InsecureSkipTLSVerify: null.BoolFrom(true), }) + require.NoError(t, err) + registry := metrics.NewRegistry() builtinMetrics := metrics.RegisterBuiltinMetrics(registry) r2, err := NewFromArchive(testutils.NewLogger(t), r1.MakeArchive(), lib.RuntimeOptions{}, builtinMetrics, registry)