Skip to content

Commit c4f0ca1

Browse files
committed
fix linter
1 parent c458c8c commit c4f0ca1

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

lib/services/local/session_test.go

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
"time"
2626

2727
"github.com/google/go-cmp/cmp"
28-
gocmp "github.com/google/go-cmp/cmp"
2928
"github.com/google/go-cmp/cmp/cmpopts"
3029
"github.com/google/uuid"
30+
"github.com/gravitational/trace"
3131
"github.com/jonboulle/clockwork"
3232
"github.com/stretchr/testify/assert"
3333
"github.com/stretchr/testify/require"
@@ -37,7 +37,6 @@ import (
3737
"github.com/gravitational/teleport/api/utils/clientutils"
3838
"github.com/gravitational/teleport/lib/backend/memory"
3939
"github.com/gravitational/teleport/lib/itertools/stream"
40-
"github.com/gravitational/trace"
4140
)
4241

4342
func TestDeleteUserAppSessions(t *testing.T) {
@@ -310,20 +309,20 @@ func TestWebTokenCRUD(t *testing.T) {
310309
// Fetch all tokens.
311310
out, err = identity.GetWebTokens(ctx)
312311
require.NoError(t, err)
313-
require.Empty(t, gocmp.Diff(expected, out,
312+
require.Empty(t, cmp.Diff(expected, out,
314313
cmpopts.IgnoreFields(types.Metadata{}, "Revision"),
315314
))
316315

317316
out, next, err = identity.ListWebTokens(ctx, 0, "")
318317
require.NoError(t, err)
319-
require.Empty(t, gocmp.Diff(expected, out,
318+
require.Empty(t, cmp.Diff(expected, out,
320319
cmpopts.IgnoreFields(types.Metadata{}, "Revision"),
321320
))
322321
require.Empty(t, next)
323322

324323
out, err = stream.Collect(identity.RangeWebTokens(ctx, "", ""))
325324
require.NoError(t, err)
326-
require.Empty(t, gocmp.Diff(expected, out,
325+
require.Empty(t, cmp.Diff(expected, out,
327326
cmpopts.IgnoreFields(types.Metadata{}, "Revision"),
328327
))
329328

@@ -333,7 +332,7 @@ func TestWebTokenCRUD(t *testing.T) {
333332
User: expected[1].GetUser(),
334333
})
335334
require.NoError(t, err)
336-
require.Empty(t, gocmp.Diff(expected[1], token,
335+
require.Empty(t, cmp.Diff(expected[1], token,
337336
cmpopts.IgnoreFields(types.Metadata{}, "Revision"),
338337
))
339338

@@ -353,7 +352,7 @@ func TestWebTokenCRUD(t *testing.T) {
353352
User: expected[1].GetUser(),
354353
})
355354
require.NoError(t, err)
356-
require.Empty(t, gocmp.Diff(expected[1], token,
355+
require.Empty(t, cmp.Diff(expected[1], token,
357356
cmpopts.IgnoreFields(types.Metadata{}, "Revision"),
358357
))
359358

@@ -369,28 +368,28 @@ func TestWebTokenCRUD(t *testing.T) {
369368

370369
listed := append(page1, page2...)
371370

372-
assert.Empty(t, gocmp.Diff(expected, listed,
371+
assert.Empty(t, cmp.Diff(expected, listed,
373372
cmpopts.IgnoreFields(types.Metadata{}, "Revision"),
374373
))
375374

376375
out, err = stream.Collect(identity.RangeWebTokens(ctx, "", page2Start))
377376
require.NoError(t, err)
378377
assert.Len(t, out, len(page1))
379-
assert.Empty(t, gocmp.Diff(page1, out,
378+
assert.Empty(t, cmp.Diff(page1, out,
380379
cmpopts.IgnoreFields(types.Metadata{}, "Revision"),
381380
))
382381

383382
out, err = stream.Collect(identity.RangeWebTokens(ctx, "", ""))
384383
require.NoError(t, err)
385384
assert.Len(t, out, len(expected))
386-
assert.Empty(t, gocmp.Diff(expected, out,
385+
assert.Empty(t, cmp.Diff(expected, out,
387386
cmpopts.IgnoreFields(types.Metadata{}, "Revision"),
388387
))
389388

390389
out, err = stream.Collect(identity.RangeWebTokens(ctx, page2Start, ""))
391390
require.NoError(t, err)
392391
assert.Len(t, out, len(expected)-2)
393-
assert.Empty(t, gocmp.Diff(expected, append(page1, out...),
392+
assert.Empty(t, cmp.Diff(expected, append(page1, out...),
394393
cmpopts.IgnoreFields(types.Metadata{}, "Revision"),
395394
))
396395

@@ -411,7 +410,7 @@ func TestWebTokenCRUD(t *testing.T) {
411410
out, err = stream.Collect(identity.RangeWebTokens(ctx, "", ""))
412411
require.NoError(t, err)
413412
assert.Len(t, out, len(expected)-1)
414-
assert.Empty(t, gocmp.Diff(expected[1:], out,
413+
assert.Empty(t, cmp.Diff(expected[1:], out,
415414
cmpopts.IgnoreFields(types.Metadata{}, "Revision"),
416415
))
417416

0 commit comments

Comments
 (0)