containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25315 from Luap99/lint-1.64.4 

update golangci-lint to v1.64.4
This commit is contained in:
openshift-merge-bot[bot] 2025-02-14 14:27:12 +00:00 committed by GitHub
parent 53c9100c72 77737132a5
commit 7c2959e244
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -62,7 +62,7 @@ BUILDTAGS += ${EXTRA_BUILDTAGS}
# N/B: This value is managed by Renovate, manual changes are
# possible, as long as they don't disturb the formatting
# (i.e. DO NOT ADD A 'v' prefix!)
GOLANGCI_LINT_VERSION := 1.64.2
GOLANGCI_LINT_VERSION := 1.64.4
PYTHON ?= $(shell command -v python3 python|head -n1)
PKG_MANAGER ?= $(shell command -v dnf yum|head -n1)
# ~/.local/bin is not in PATH on all systems

19
test/e2e/logs_test.go
View File

@ -60,7 +60,6 @@ var _ = Describe("Podman logs", func() {
results.WaitWithDefaultTimeout()
Expect(results).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results = podmanTest.Podman([]string{"logs", cid})
results.WaitWithDefaultTimeout()
@ -82,7 +81,6 @@ var _ = Describe("Podman logs", func() {
wait.WaitWithDefaultTimeout()
Expect(wait).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results := podmanTest.Podman([]string{"logs", "--tail", "2", cid})
results.WaitWithDefaultTimeout()
@ -123,7 +121,6 @@ var _ = Describe("Podman logs", func() {
wait.WaitWithDefaultTimeout()
Expect(wait).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results := podmanTest.Podman([]string{"logs", "--tail", "99", name})
results.WaitWithDefaultTimeout()
@ -156,7 +153,6 @@ var _ = Describe("Podman logs", func() {
wait.WaitWithDefaultTimeout()
Expect(wait).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results := podmanTest.Podman([]string{"logs", "--tail", "800", cid})
results.WaitWithDefaultTimeout()
@ -177,7 +173,6 @@ var _ = Describe("Podman logs", func() {
wait.WaitWithDefaultTimeout()
Expect(wait).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results := podmanTest.Podman([]string{"logs", "--tail", "2", "-t", cid})
results.WaitWithDefaultTimeout()
@ -198,7 +193,6 @@ var _ = Describe("Podman logs", func() {
wait.WaitWithDefaultTimeout()
Expect(wait).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results := podmanTest.Podman([]string{"logs", "--since", "2017-08-07T10:10:09.056611202-04:00", cid})
results.WaitWithDefaultTimeout()
@ -219,7 +213,6 @@ var _ = Describe("Podman logs", func() {
wait.WaitWithDefaultTimeout()
Expect(wait).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results := podmanTest.Podman([]string{"logs", "--since", "10m", cid})
results.WaitWithDefaultTimeout()
@ -240,7 +233,6 @@ var _ = Describe("Podman logs", func() {
wait.WaitWithDefaultTimeout()
Expect(wait).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results := podmanTest.Podman([]string{"logs", "--until", "10m", cid})
results.WaitWithDefaultTimeout()
@ -261,7 +253,6 @@ var _ = Describe("Podman logs", func() {
wait.WaitWithDefaultTimeout()
Expect(wait).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
now := time.Now()
now = now.Add(time.Minute * 1)
@ -400,7 +391,6 @@ var _ = Describe("Podman logs", func() {
Expect(inspect).To(ExitCleanly())
Expect(inspect.OutputToString()).To(Equal("10kB"))
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results := podmanTest.Podman([]string{"logs", cid})
results.WaitWithDefaultTimeout()
@ -420,7 +410,6 @@ var _ = Describe("Podman logs", func() {
wait.WaitWithDefaultTimeout()
Expect(wait).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results := podmanTest.Podman([]string{"logs", "test"})
results.WaitWithDefaultTimeout()
@ -444,7 +433,6 @@ var _ = Describe("Podman logs", func() {
wait.WaitWithDefaultTimeout()
Expect(wait).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results := podmanTest.Podman([]string{"logs", cname})
results.WaitWithDefaultTimeout()
@ -467,7 +455,6 @@ var _ = Describe("Podman logs", func() {
// However this test must make sure that there is no such extra newline.
Expect(string(logc.Out.Contents())).To(Equal(content))
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
logs := podmanTest.Podman([]string{"logs", cname})
logs.WaitWithDefaultTimeout()
@ -502,7 +489,6 @@ var _ = Describe("Podman logs", func() {
ctr.WaitWithDefaultTimeout()
Expect(ctr).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results := podmanTest.Podman([]string{"pod", "logs", "-l"})
results.WaitWithDefaultTimeout()
@ -538,7 +524,6 @@ var _ = Describe("Podman logs", func() {
log2.WaitWithDefaultTimeout()
Expect(log2).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results := podmanTest.Podman([]string{"pod", "logs", "-l"})
results.WaitWithDefaultTimeout()
@ -561,7 +546,6 @@ var _ = Describe("Podman logs", func() {
wait.WaitWithDefaultTimeout()
Expect(wait).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
cmd := exec.Command("journalctl", "--no-pager", "-o", "json", "--output-fields=CONTAINER_TAG", fmt.Sprintf("CONTAINER_ID_FULL=%s", cid))
out, err := cmd.CombinedOutput()
@ -582,7 +566,6 @@ var _ = Describe("Podman logs", func() {
wait.WaitWithDefaultTimeout()
Expect(wait).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
cmd := exec.Command("journalctl", "--no-pager", "-o", "json", "--output-fields=CONTAINER_NAME", fmt.Sprintf("CONTAINER_ID_FULL=%s", cid))
out, err := cmd.CombinedOutput()
@ -649,7 +632,6 @@ var _ = Describe("Podman logs", func() {
log2.WaitWithDefaultTimeout()
Expect(log2).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results := podmanTest.Podman([]string{"pod", "logs", "--names", podName})
results.WaitWithDefaultTimeout()
@ -676,7 +658,6 @@ var _ = Describe("Podman logs", func() {
log2.WaitWithDefaultTimeout()
Expect(log2).To(ExitCleanly())
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
Eventually(func(g Gomega) {
results := podmanTest.Podman([]string{"pod", "logs", "--color", podName})
results.WaitWithDefaultTimeout()