Skip to content

Commit a70b8b1

Browse files
mmorel-35mmorel-35
committed
fix testifylint issues
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent a45be3c commit a70b8b1

File tree

79 files changed

+2466
-2643
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2466
-2643
lines changed

‎agent/agent_test.go‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,12 @@ func TestAgentStartStop(t *testing.T) {
9494
defer cancel()
9595

9696
assert.Equal(t, errAgentNotStarted, agent.Stop(ctx))
97-
assert.NoError(t, agent.Start(ctx))
97+
require.NoError(t, agent.Start(ctx))
9898

99-
if err := agent.Start(ctx); err != errAgentStarted {
100-
t.Fatalf("expected agent started error: %v", err)
101-
}
99+
err = agent.Start(ctx)
100+
require.Equalf(t, err, errAgentStarted, "expected agent started error: %v", err)
102101

103-
assert.NoError(t, agent.Stop(ctx))
102+
require.NoError(t, agent.Stop(ctx))
104103
}
105104

106105
func TestHandleSessionMessageNetworkManagerChanges(t *testing.T) {
@@ -429,9 +428,9 @@ func TestAgentExitsBasedOnSessionTracker(t *testing.T) {
429428
}
430429

431430
establishedSessions, errCounter, closeClounter := tracker.Stats()
432-
require.Equal(t, establishedSessions, 0)
433-
require.Equal(t, errCounter, 3)
434-
require.Equal(t, closeClounter, 3)
431+
require.Equal(t, 0, establishedSessions)
432+
require.Equal(t, 3, errCounter)
433+
require.Equal(t, 3, closeClounter)
435434
currSession, closedSessions := tester.dispatcher.GetSessions()
436435
require.Nil(t, currSession)
437436
require.Len(t, closedSessions, 3)
@@ -461,11 +460,11 @@ func TestAgentRegistersSessionsWithSessionTracker(t *testing.T) {
461460
}
462461
return nil
463462
}, 3*time.Millisecond))
464-
require.Equal(t, errCounter, 0)
465-
require.Equal(t, closeCounter, 0)
463+
require.Equal(t, 0, errCounter)
464+
require.Equal(t, 0, closeCounter)
466465
currSession, closedSessions := tester.dispatcher.GetSessions()
467466
require.NotNil(t, currSession)
468-
require.Len(t, closedSessions, 0)
467+
require.Empty(t, closedSessions)
469468
}
470469

471470
type agentTester struct {

‎agent/csi/volume_manager_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/moby/swarmkit/v2/api"
1010
"github.com/moby/swarmkit/v2/volumequeue"
1111
"github.com/stretchr/testify/assert"
12+
"github.com/stretchr/testify/require"
1213
)
1314

1415
const (
@@ -84,10 +85,10 @@ func TestTaskRestrictedVolumesProvider(t *testing.T) {
8485

8586
volume, err := volumesGetter.Get(testCase.volumeID)
8687
if testCase.expectedErr != "" {
87-
assert.Error(t, err, testCase.desc)
88+
require.Error(t, err, testCase.desc)
8889
assert.Equal(t, testCase.expectedErr, err.Error())
8990
} else {
90-
assert.NoError(t, err)
91+
require.NoError(t, err)
9192
assert.NotEmpty(t, volume)
9293
}
9394
})

‎agent/exec/controller_test.go‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/moby/swarmkit/v2/api"
1212
"github.com/moby/swarmkit/v2/log"
1313
"github.com/stretchr/testify/assert"
14+
"github.com/stretchr/testify/require"
1415
)
1516

1617
func TestResolve(t *testing.T) {
@@ -21,14 +22,14 @@ func TestResolve(t *testing.T) {
2122
)
2223

2324
_, status, err := Resolve(ctx, task, executor)
24-
assert.NoError(t, err)
25+
require.NoError(t, err)
2526
assert.Equal(t, api.TaskStateAccepted, status.State)
2627
assert.Equal(t, "accepted", status.Message)
2728

2829
task.Status = *status
2930
// now, we get no status update.
3031
_, status, err = Resolve(ctx, task, executor)
31-
assert.NoError(t, err)
32+
require.NoError(t, err)
3233
assert.Equal(t, task.Status, *status)
3334

3435
// now test an error causing rejection
@@ -56,7 +57,7 @@ func TestResolve(t *testing.T) {
5657
task.Status = *status
5758
executor.err = nil
5859
_, status, err = Resolve(ctx, task, executor)
59-
assert.NoError(t, err)
60+
require.NoError(t, err)
6061
assert.Equal(t, task.Status, *status)
6162
}
6263

@@ -138,7 +139,7 @@ func TestPrepareFailure(t *testing.T) {
138139
)
139140
defer func() {
140141
finish()
141-
assert.Equal(t, ctlr.calls["Prepare"], 1)
142+
assert.Equal(t, 1, ctlr.calls["Prepare"])
142143
}()
143144
ctlr.PrepareFn = func(_ context.Context) error {
144145
return errors.New("test error")
@@ -461,22 +462,20 @@ func checkDo(ctx context.Context, t *testing.T, task *api.Task, ctlr Controller,
461462
if len(expectedErr) > 0 {
462463
assert.Equal(t, expectedErr[0], err)
463464
} else {
464-
assert.NoError(t, err)
465+
require.NoError(t, err)
465466
}
466467

467468
// if the status and task.Status are different, make sure new timestamp is greater
468469
if task.Status.Timestamp != nil {
469470
// crazy timestamp validation follows
470471
previous, err := gogotypes.TimestampFromProto(task.Status.Timestamp)
471-
assert.Nil(t, err)
472+
require.NoError(t, err)
472473

473474
current, err := gogotypes.TimestampFromProto(status.Timestamp)
474-
assert.Nil(t, err)
475+
require.NoError(t, err)
475476

476-
if current.Before(previous) {
477-
// ensure that the timestamp always proceeds forward
478-
t.Fatalf("timestamp must proceed forward: %v < %v", current, previous)
479-
}
477+
// ensure that the timestamp always proceeds forward
478+
require.Falsef(t, current.Before(previous), "timestamp must proceed forward: %v < %v", current, previous)
480479
}
481480

482481
copy := status.Copy()

‎agent/reporter_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
"github.com/moby/swarmkit/v2/api"
1212
"github.com/stretchr/testify/assert"
13+
"github.com/stretchr/testify/require"
1314
)
1415

1516
type uniqueStatus struct {
@@ -41,9 +42,8 @@ func TestReporter(t *testing.T) {
4142

4243
key := uniqueStatus{taskID, status}
4344
// make sure we get the status only once.
44-
if _, ok := unique[key]; ok {
45-
t.Fatal("encountered status twice")
46-
}
45+
_, ok := unique[key]
46+
require.False(t, ok, "encountered status twice")
4747

4848
if status.State == api.TaskStateCompleted {
4949
wg.Done()
@@ -81,15 +81,15 @@ func TestReporter(t *testing.T) {
8181
// simulate pounding this with a bunch of goroutines
8282
go func() {
8383
if err := reporter.UpdateTaskStatus(ctx, taskID, status); err != nil {
84-
assert.NoError(t, err, "sending should not fail")
84+
require.NoError(t, err, "sending should not fail")
8585
}
8686
}()
8787

8888
}
8989
}
9090

9191
wg.Wait() // wait for the propagation
92-
assert.NoError(t, reporter.Close())
92+
require.NoError(t, reporter.Close())
9393
mu.Lock()
9494
defer mu.Unlock()
9595

‎agent/secrets/secrets_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ func TestTaskRestrictedSecretsProvider(t *testing.T) {
9898
(secretsGetter.(*taskRestrictedSecretsProvider)).secretIDs = testCase.secretIDs
9999
secret, err := secretsGetter.Get(testCase.secretIDToGet)
100100
if testCase.expectedErr != "" {
101-
assert.Error(t, err, testCase.desc)
101+
require.Error(t, err, testCase.desc)
102102
assert.Equal(t, testCase.expectedErr, err.Error(), testCase.desc)
103103
} else {
104104
t.Logf("secretIDs=%v", testCase.secretIDs)
105-
assert.NoError(t, err, testCase.desc)
105+
require.NoError(t, err, testCase.desc)
106106
require.NotNil(t, secret, testCase.desc)
107107
require.NotNil(t, secret.Spec, testCase.desc)
108108
require.NotNil(t, secret.Spec.Data, testCase.desc)

‎agent/storage_test.go‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ import (
1010
"github.com/moby/swarmkit/v2/api"
1111
"github.com/moby/swarmkit/v2/identity"
1212
"github.com/stretchr/testify/assert"
13+
"github.com/stretchr/testify/require"
1314
bolt "go.etcd.io/bbolt"
1415
)
1516

1617
func TestStorageInit(t *testing.T) {
1718
db, cleanup := storageTestEnv(t)
1819
defer cleanup()
1920

20-
assert.NoError(t, InitDB(db)) // ensure idempotence.
21-
assert.NoError(t, db.View(func(tx *bolt.Tx) error {
21+
require.NoError(t, InitDB(db)) // ensure idempotence.
22+
require.NoError(t, db.View(func(tx *bolt.Tx) error {
2223
bkt := tx.Bucket(bucketKeyStorageVersion)
2324
assert.NotNil(t, bkt)
2425

@@ -35,20 +36,20 @@ func TestStoragePutGet(t *testing.T) {
3536

3637
tasks := genTasks(20)
3738

38-
assert.NoError(t, db.Update(func(tx *bolt.Tx) error {
39+
require.NoError(t, db.Update(func(tx *bolt.Tx) error {
3940
for i, task := range tasks {
40-
assert.NoError(t, PutTask(tx, task))
41+
require.NoError(t, PutTask(tx, task))
4142
// remove status to make comparison work
4243
tasks[i].Status = api.TaskStatus{}
4344
}
4445

4546
return nil
4647
}))
4748

48-
assert.NoError(t, db.View(func(tx *bolt.Tx) error {
49+
require.NoError(t, db.View(func(tx *bolt.Tx) error {
4950
for _, task := range tasks {
5051
retrieved, err := GetTask(tx, task.ID)
51-
assert.NoError(t, err)
52+
require.NoError(t, err)
5253
assert.Equal(t, task, retrieved)
5354
}
5455

@@ -63,24 +64,24 @@ func TestStoragePutGetStatusAssigned(t *testing.T) {
6364
tasks := genTasks(20)
6465

6566
// set task, status and assignment for all tasks.
66-
assert.NoError(t, db.Update(func(tx *bolt.Tx) error {
67+
require.NoError(t, db.Update(func(tx *bolt.Tx) error {
6768
for _, task := range tasks {
68-
assert.NoError(t, PutTask(tx, task))
69-
assert.NoError(t, PutTaskStatus(tx, task.ID, &task.Status))
70-
assert.NoError(t, SetTaskAssignment(tx, task.ID, true))
69+
require.NoError(t, PutTask(tx, task))
70+
require.NoError(t, PutTaskStatus(tx, task.ID, &task.Status))
71+
require.NoError(t, SetTaskAssignment(tx, task.ID, true))
7172
}
7273

7374
return nil
7475
}))
7576

76-
assert.NoError(t, db.View(func(tx *bolt.Tx) error {
77+
require.NoError(t, db.View(func(tx *bolt.Tx) error {
7778
for _, task := range tasks {
7879
status, err := GetTaskStatus(tx, task.ID)
79-
assert.NoError(t, err)
80+
require.NoError(t, err)
8081
assert.Equal(t, &task.Status, status)
8182

8283
retrieved, err := GetTask(tx, task.ID)
83-
assert.NoError(t, err)
84+
require.NoError(t, err)
8485

8586
task.Status = api.TaskStatus{}
8687
assert.Equal(t, task, retrieved)
@@ -92,27 +93,27 @@ func TestStoragePutGetStatusAssigned(t *testing.T) {
9293
}))
9394

9495
// set evens to unassigned and updates all states plus one
95-
assert.NoError(t, db.Update(func(tx *bolt.Tx) error {
96+
require.NoError(t, db.Update(func(tx *bolt.Tx) error {
9697
for i, task := range tasks {
9798
task.Status.State++
98-
assert.NoError(t, PutTaskStatus(tx, task.ID, &task.Status))
99+
require.NoError(t, PutTaskStatus(tx, task.ID, &task.Status))
99100

100101
if i%2 == 0 {
101-
assert.NoError(t, SetTaskAssignment(tx, task.ID, false))
102+
require.NoError(t, SetTaskAssignment(tx, task.ID, false))
102103
}
103104
}
104105

105106
return nil
106107
}))
107108

108-
assert.NoError(t, db.View(func(tx *bolt.Tx) error {
109+
require.NoError(t, db.View(func(tx *bolt.Tx) error {
109110
for i, task := range tasks {
110111
status, err := GetTaskStatus(tx, task.ID)
111-
assert.NoError(t, err)
112+
require.NoError(t, err)
112113
assert.Equal(t, &task.Status, status)
113114

114115
retrieved, err := GetTask(tx, task.ID)
115-
assert.NoError(t, err)
116+
require.NoError(t, err)
116117

117118
task.Status = api.TaskStatus{}
118119
assert.Equal(t, task, retrieved)
@@ -178,13 +179,13 @@ func storageTestEnv(t *testing.T) (*bolt.DB, func()) {
178179
var cleanup []func()
179180
dir := t.TempDir()
180181
dbpath := filepath.Join(dir, "tasks.db")
181-
assert.NoError(t, os.MkdirAll(dir, 0o777))
182+
require.NoError(t, os.MkdirAll(dir, 0o777))
182183

183184
db, err := bolt.Open(dbpath, 0666, nil)
184-
assert.NoError(t, err)
185+
require.NoError(t, err)
185186
cleanup = append(cleanup, func() { db.Close() })
186187

187-
assert.NoError(t, InitDB(db))
188+
require.NoError(t, InitDB(db))
188189
return db, func() {
189190
// iterate in reverse so it works like defer
190191
for i := len(cleanup) - 1; i >= 0; i-- {

‎agent/task_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/moby/swarmkit/v2/api"
1010
"github.com/moby/swarmkit/v2/log"
1111
"github.com/stretchr/testify/assert"
12+
"github.com/stretchr/testify/require"
1213
)
1314

1415
const debugLevel = 5
@@ -70,22 +71,22 @@ func TestTaskManager(t *testing.T) {
7071
select {
7172
case <-acceptedWait:
7273
task.DesiredState = api.TaskStateReady // proceed to ready
73-
assert.NoError(t, tm.Update(ctx, task))
74+
require.NoError(t, tm.Update(ctx, task))
7475
acceptedWait = nil
7576
case <-readyWait:
7677
time.Sleep(time.Second)
7778
task.DesiredState = api.TaskStateRunning // proceed to running.
78-
assert.NoError(t, tm.Update(ctx, task))
79+
require.NoError(t, tm.Update(ctx, task))
7980
readyWait = nil
8081
case <-shutdownWait:
81-
assert.NoError(t, tm.Close())
82+
require.NoError(t, tm.Close())
8283
select {
8384
case <-tm.closed:
8485
default:
8586
t.Fatal("not actually closed")
8687
}
8788

88-
assert.NoError(t, tm.Close()) // hit a second time to make sure it behaves
89+
require.NoError(t, tm.Close()) // hit a second time to make sure it behaves
8990
assert.Equal(t, tm.Update(ctx, task), ErrClosed)
9091

9192
assert.Equal(t, map[string]int{

0 commit comments

Comments
 (0)