opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2026-03-13 08:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "silence false positve from golangci-lint"

Browse Source 
This reverts commit 8b6f14f95b.

https://github.com/golangci/golangci-lint/issues/5398 is fixed

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2025-02-13 12:18:53 +01:00
parent 035fff5fd2
commit 77737132a5
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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