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

Merge pull request #7168 from mxpv/linter

Browse Source 
Update and align golangci-lint version
This commit is contained in:
Maksym Pavlenko 2022-07-18 12:23:06 -07:00 committed by GitHub
commit e69a83f356
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -31,7 +31,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: golangci/golangci-lint-action@v3 - uses: golangci/golangci-lint-action@v3
with: with:
version: v1.45.0 version: v1.46.2
skip-cache: true skip-cache: true
args: --timeout=5m args: --timeout=5m

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())

2
script/setup/install-dev-tools
View File

@ -24,7 +24,7 @@ set -eu -o pipefail
go install github.com/containerd/protobuild@v0.2.0 go install github.com/containerd/protobuild@v0.2.0
go install github.com/containerd/protobuild/cmd/go-fix-acronym@v0.2.0 go install github.com/containerd/protobuild/cmd/go-fix-acronym@v0.2.0
go install github.com/cpuguy83/go-md2man/v2@v2.0.1 go install github.com/cpuguy83/go-md2man/v2@v2.0.1
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.42.0 go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
go install github.com/containerd/ttrpc/cmd/protoc-gen-go-ttrpc@944ef4a40df3446714a823207972b7d9858ffac5 go install github.com/containerd/ttrpc/cmd/protoc-gen-go-ttrpc@944ef4a40df3446714a823207972b7d9858ffac5