Skip to content

Commit 0b41c90

Browse files
committed
golangci-lint: fix noctx issues in tests
1 parent ba92f7f commit 0b41c90

File tree

18 files changed

+61
-57
lines changed

18 files changed

+61
-57
lines changed

internal/cmd/tests/grpc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func NewGRPC(t testing.TB) *GRPC {
2424

2525
addr := getFreeBindAddr(t)
2626

27-
lis, err := net.Listen("tcp", addr)
27+
lis, err := (&net.ListenConfig{}).Listen(t.Context(), "tcp", addr)
2828
if err != nil {
2929
t.Fatalf("failed to listen: %v", err)
3030
}

internal/cmd/tests/test_state.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"github.com/sirupsen/logrus"
1717
"github.com/stretchr/testify/assert"
1818
"github.com/stretchr/testify/require"
19+
1920
"go.k6.io/k6/cmd/state"
2021
"go.k6.io/k6/internal/event"
2122
"go.k6.io/k6/internal/lib/testutils"
@@ -128,7 +129,7 @@ func getFreeBindAddr(tb testing.TB) string {
128129
port := atomic.AddUint64(&portRangeStart, 1)
129130
addr := net.JoinHostPort("localhost", strconv.FormatUint(port, 10))
130131

131-
listener, err := net.Listen("tcp", addr)
132+
listener, err := (&net.ListenConfig{}).Listen(tb.Context(), "tcp", addr)
132133
if err != nil {
133134
continue // port was busy for some reason
134135
}

internal/js/modules/k6/browser/browser/helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
func panicIfFatalError(ctx context.Context, err error) {
1616
if errors.Is(err, k6error.ErrFatal) {
17-
k6ext.Abort(ctx, err.Error())
17+
k6ext.Abortf(ctx, err.Error())
1818
}
1919
}
2020

internal/js/modules/k6/browser/browser/module.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ func (m *RootModule) initialize(vu k6modules.VU) {
113113
)
114114
m.remoteRegistry, err = newRemoteRegistry(initEnv.LookupEnv)
115115
if err != nil {
116-
k6ext.Abort(vu.Context(), "failed to create remote registry: %v", err)
116+
k6ext.Abortf(vu.Context(), "failed to create remote registry: %v", err)
117117
}
118118
m.tracesMetadata, err = parseTracesMetadata(initEnv.LookupEnv)
119119
if err != nil {
120-
k6ext.Abort(vu.Context(), "parsing browser traces metadata: %v", err)
120+
k6ext.Abortf(vu.Context(), "parsing browser traces metadata: %v", err)
121121
}
122122
m.filePersister, err = newScreenshotPersister(initEnv.LookupEnv)
123123
if err != nil {
124-
k6ext.Abort(vu.Context(), "failed to create file persister: %v", err)
124+
k6ext.Abortf(vu.Context(), "failed to create file persister: %v", err)
125125
}
126126
if e, ok := initEnv.LookupEnv(env.K6TestRunID); ok && e != "" {
127127
m.testRunID = e

internal/js/modules/k6/browser/browser/registry.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ func (r *browserRegistry) handleIterEvents(
281281

282282
if data, ok = e.Data.(k6event.IterData); !ok {
283283
e.Done()
284-
k6ext.Abort(vuCtx, "unexpected iteration event data format: %v", e.Data)
284+
k6ext.Abortf(vuCtx, "unexpected iteration event data format: %v", e.Data)
285285
// Continue so we don't block the k6 event system producer.
286286
// Test will be aborted by k6, which will previously send the
287287
// 'Exit' event so browser resources cleanup can be guaranteed.
@@ -306,7 +306,7 @@ func (r *browserRegistry) handleIterEvents(
306306
b, err := r.buildFn(ctx, tracedCtx)
307307
if err != nil {
308308
e.Done()
309-
k6ext.Abort(vuCtx, "error building browser on IterStart: %v", err)
309+
k6ext.Abortf(vuCtx, "error building browser on IterStart: %v", err)
310310
// Continue so we don't block the k6 event system producer.
311311
// Test will be aborted by k6, which will previously send the
312312
// 'Exit' event so browser resources cleanup can be guaranteed.

internal/js/modules/k6/browser/common/browser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ func (b *Browser) initEvents() error {
235235
if ev, ok := event.data.(*target.EventAttachedToTarget); ok {
236236
b.logger.Debugf("Browser:initEvents:onAttachedToTarget", "sid:%v tid:%v", ev.SessionID, ev.TargetInfo.TargetID)
237237
if err := b.onAttachedToTarget(ev); err != nil {
238-
k6ext.Panic(b.vuCtx, "browser is attaching to target: %w", err)
238+
k6ext.Panicf(b.vuCtx, "browser is attaching to target: %w", err)
239239
}
240240
} else if ev, ok := event.data.(*target.EventDetachedFromTarget); ok {
241241
b.logger.Debugf("Browser:initEvents:onDetachedFromTarget", "sid:%v", ev.SessionID)

internal/js/modules/k6/browser/common/frame_session.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ func (fs *FrameSession) onExecutionContextCreated(event *cdpruntime.EventExecuti
682682
Type string `json:"type"`
683683
}
684684
if err := json.Unmarshal(auxData, &i); err != nil {
685-
k6ext.Panic(fs.ctx, "unmarshaling executionContextCreated event JSON: %w", err)
685+
k6ext.Panicf(fs.ctx, "unmarshaling executionContextCreated event JSON: %w", err)
686686
}
687687

688688
frame, ok := fs.manager.getFrameByID(i.FrameID)
@@ -767,7 +767,7 @@ func (fs *FrameSession) onFrameDetached(frameID cdp.FrameID, reason cdppage.Fram
767767
fs.session.ID(), fs.targetID, frameID, reason)
768768

769769
if err := fs.manager.frameDetached(frameID, reason); err != nil {
770-
k6ext.Panic(fs.ctx, "handling frameDetached event: %w", err)
770+
k6ext.Panicf(fs.ctx, "handling frameDetached event: %w", err)
771771
}
772772
}
773773

@@ -780,7 +780,7 @@ func (fs *FrameSession) onFrameNavigated(frame *cdp.Frame, initial bool) {
780780
frame.ID, frame.ParentID, frame.LoaderID.String(),
781781
frame.Name, frame.URL+frame.URLFragment, initial)
782782
if err != nil {
783-
k6ext.Panic(fs.ctx, "handling frameNavigated event to %q: %w",
783+
k6ext.Panicf(fs.ctx, "handling frameNavigated event to %q: %w",
784784
frame.URL+frame.URLFragment, err)
785785
}
786786

@@ -855,7 +855,7 @@ func (fs *FrameSession) onFrameRequestedNavigation(event *cdppage.EventFrameRequ
855855
if event.Disposition == "currentTab" {
856856
err := fs.manager.frameRequestedNavigation(event.FrameID, event.URL, "")
857857
if err != nil {
858-
k6ext.Panic(fs.ctx, "handling frameRequestedNavigation event to %q: %w", event.URL, err)
858+
k6ext.Panicf(fs.ctx, "handling frameRequestedNavigation event to %q: %w", event.URL, err)
859859
}
860860
}
861861
}
@@ -995,7 +995,7 @@ func (fs *FrameSession) onAttachedToTarget(event *target.EventAttachedToTarget)
995995
return // ignore
996996
}
997997
reason = "fatal"
998-
k6ext.Panic(fs.ctx, "attaching %v: %w", ti.Type, err)
998+
k6ext.Panicf(fs.ctx, "attaching %v: %w", ti.Type, err)
999999
}
10001000
}
10011001

@@ -1064,7 +1064,7 @@ func (fs *FrameSession) onTargetCrashed() {
10641064
// TODO:?
10651065
s, ok := fs.session.(*Session)
10661066
if !ok {
1067-
k6ext.Panic(fs.ctx, "unexpected type %T", fs.session)
1067+
k6ext.Panicf(fs.ctx, "unexpected type %T", fs.session)
10681068
}
10691069
s.markAsCrashed()
10701070
}

internal/js/modules/k6/browser/common/helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ func createWaitForEventPredicateHandler(
210210
//nolint:unused
211211
func panicOrSlowMo(ctx context.Context, err error) {
212212
if err != nil {
213-
k6ext.Panic(ctx, "%w", err)
213+
k6ext.Panicf(ctx, "%w", err)
214214
}
215215
applySlowMo(ctx)
216216
}

internal/js/modules/k6/browser/common/network_manager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,14 +1041,14 @@ func (m *NetworkManager) ThrottleNetwork(networkProfile NetworkProfile) error {
10411041
func (m *NetworkManager) SetUserAgent(userAgent string) {
10421042
action := emulation.SetUserAgentOverride(userAgent)
10431043
if err := action.Do(cdp.WithExecutor(m.ctx, m.session)); err != nil {
1044-
k6ext.Panic(m.ctx, "setting user agent: %w", err)
1044+
k6ext.Panicf(m.ctx, "setting user agent: %w", err)
10451045
}
10461046
}
10471047

10481048
// SetCacheEnabled toggles cache on/off.
10491049
func (m *NetworkManager) SetCacheEnabled(enabled bool) {
10501050
m.userCacheDisabled = !enabled
10511051
if err := m.updateProtocolCacheDisabled(); err != nil {
1052-
k6ext.Panic(m.ctx, "%v", err)
1052+
k6ext.Panicf(m.ctx, "%v", err)
10531053
}
10541054
}

internal/js/modules/k6/browser/k6ext/panic.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ import (
1414
k6common "go.k6.io/k6/js/common"
1515
)
1616

17-
// Abort will shutdown the whole test run. This should
17+
// Abortf will shutdown the whole test run. This should
1818
// only be used from the sobek mapping layer. It is only
1919
// to be used when an error will occur in all iterations,
2020
// so it's permanent.
21-
func Abort(ctx context.Context, format string, a ...any) {
21+
func Abortf(ctx context.Context, format string, a ...any) {
2222
failFunc := func(rt *sobek.Runtime, a ...any) {
2323
reason := fmt.Errorf(format, a...).Error()
2424
rt.Interrupt(&errext.InterruptError{Reason: reason})
2525
}
2626
sharedPanic(ctx, failFunc, a...)
2727
}
2828

29-
// Panic will cause a panic with the given error which will stop
29+
// Panicf will cause a panic with the given error which will stop
3030
// the current iteration. Before panicking, it will find the
3131
// browser process from the context and kill it if it still exists.
3232
// TODO: test.
33-
func Panic(ctx context.Context, format string, a ...any) {
33+
func Panicf(ctx context.Context, format string, a ...any) {
3434
failFunc := func(rt *sobek.Runtime, a ...any) {
3535
k6common.Throw(rt, fmt.Errorf(format, a...))
3636
}

0 commit comments

Comments
 (0)