diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index eb0746ef4..acbd59536 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -40,7 +40,7 @@ jobs: sudo apt -qy install libseccomp-dev - uses: golangci/golangci-lint-action@v6 with: - version: v1.59 + version: v1.60 # Extra linters, only checking new code from a pull request. - name: lint-extra if: github.event_name == 'pull_request' diff --git a/libcontainer/cgroups/fs/blkio_test.go b/libcontainer/cgroups/fs/blkio_test.go index 09abd7123..d2603fd6c 100644 --- a/libcontainer/cgroups/fs/blkio_test.go +++ b/libcontainer/cgroups/fs/blkio_test.go @@ -1,7 +1,6 @@ package fs import ( - "fmt" "strconv" "testing" @@ -478,7 +477,7 @@ func TestBlkioStatsNoFilesBFQDebug(t *testing.T) { actualStats := *cgroups.NewStats() err := cpuset.GetStats(path, &actualStats) if err != nil { - t.Errorf(fmt.Sprintf("test case '%s' failed unexpectedly: %s", testCase.desc, err)) + t.Errorf("%s: want no error, got: %+v", testCase.desc, err) } } } @@ -592,7 +591,7 @@ func TestBlkioStatsNoFilesCFQ(t *testing.T) { actualStats := *cgroups.NewStats() err := cpuset.GetStats(path, &actualStats) if err != nil { - t.Errorf(fmt.Sprintf("test case '%s' failed unexpectedly: %s", testCase.desc, err)) + t.Errorf("%s: want no error, got %+v", testCase.desc, err) } } } diff --git a/libcontainer/configs/config_test.go b/libcontainer/configs/config_test.go index 5c29b747f..ceabaca73 100644 --- a/libcontainer/configs/config_test.go +++ b/libcontainer/configs/config_test.go @@ -202,7 +202,7 @@ exit 0 }) if err := cmdHook.Run(state); err != nil { - t.Errorf(fmt.Sprintf("Expected error to not occur but it was %+v", err)) + t.Errorf("Want no error, got: %+v", err) } }