github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix linter warnings

Browse Source 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko 2022-07-15 13:29:04 -07:00
parent 60f51c1aa3
commit 3a3f43f72f
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/cri/store/container/status_test.go
View File

@ -131,8 +131,7 @@ func TestStatus(t *testing.T) {
t.Logf("failed update should not take effect") t.Logf("failed update should not take effect")
err = s.Update(func(o Status) (Status, error) { err = s.Update(func(o Status) (Status, error) {
o = updateStatus return updateStatus, updateErr
return o, updateErr
}) })
assert.Equal(updateErr, err) assert.Equal(updateErr, err)
assert.Equal(testStatus, s.Get()) assert.Equal(testStatus, s.Get())
@ -142,8 +141,7 @@ func TestStatus(t *testing.T) {
t.Logf("successful update should take effect but not checkpoint") t.Logf("successful update should take effect but not checkpoint")
err = s.Update(func(o Status) (Status, error) { err = s.Update(func(o Status) (Status, error) {
o = updateStatus return updateStatus, nil
return o, nil
}) })
assert.NoError(err) assert.NoError(err)
assert.Equal(updateStatus, s.Get()) assert.Equal(updateStatus, s.Get())
@ -152,14 +150,12 @@ func TestStatus(t *testing.T) {
assert.Equal(testStatus, loaded) assert.Equal(testStatus, loaded)
// Recover status. // Recover status.
assert.NoError(s.Update(func(o Status) (Status, error) { assert.NoError(s.Update(func(o Status) (Status, error) {
o = testStatus return testStatus, nil
return o, nil
})) }))
t.Logf("failed update sync should not take effect") t.Logf("failed update sync should not take effect")
err = s.UpdateSync(func(o Status) (Status, error) { err = s.UpdateSync(func(o Status) (Status, error) {
o = updateStatus return updateStatus, updateErr
return o, updateErr
}) })
assert.Equal(updateErr, err) assert.Equal(updateErr, err)
assert.Equal(testStatus, s.Get()) assert.Equal(testStatus, s.Get())
@ -169,8 +165,7 @@ func TestStatus(t *testing.T) {
t.Logf("successful update sync should take effect and checkpoint") t.Logf("successful update sync should take effect and checkpoint")
err = s.UpdateSync(func(o Status) (Status, error) { err = s.UpdateSync(func(o Status) (Status, error) {
o = updateStatus return updateStatus, nil
return o, nil
}) })
assert.NoError(err) assert.NoError(err)
assert.Equal(updateStatus, s.Get()) assert.Equal(updateStatus, s.Get())

6
pkg/cri/store/sandbox/status_test.go
View File

@ -45,16 +45,14 @@ func TestStatus(t *testing.T) {
t.Logf("failed update should not take effect") t.Logf("failed update should not take effect")
err := s.Update(func(o Status) (Status, error) { err := s.Update(func(o Status) (Status, error) {
o = updateStatus return updateStatus, updateErr
return o, updateErr
}) })
assert.Equal(updateErr, err) assert.Equal(updateErr, err)
assert.Equal(testStatus, s.Get()) assert.Equal(testStatus, s.Get())
t.Logf("successful update should take effect but not checkpoint") t.Logf("successful update should take effect but not checkpoint")
err = s.Update(func(o Status) (Status, error) { err = s.Update(func(o Status) (Status, error) {
o = updateStatus return updateStatus, nil
return o, nil
}) })
assert.NoError(err) assert.NoError(err)
assert.Equal(updateStatus, s.Get()) assert.Equal(updateStatus, s.Get())