Skip to content

Commit fc63a34

Browse files
Luap99Luap99
committed
silence false positve from golangci-lint
This is valid and the upstream linter allows it but somehow with golangci-lint it produces an error: Success matcher only support a single error value, or function with Gomega as its first parameter I reported a bug upstream[1] but for now let's just ignore it so we can update the linter. [1] golangci/golangci-lint#5398 Signed-off-by: Paul Holzinger <[email protected]> (cherry picked from commit 8b6f14f) Signed-off-by: Paul Holzinger <[email protected]>
1 parent e50898e commit fc63a34

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

‎test/e2e/logs_test.go

+19
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ var _ = Describe("Podman logs", func() {
6060
results.WaitWithDefaultTimeout()
6161
Expect(results).To(ExitCleanly())
6262

63+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
6364
Eventually(func(g Gomega) {
6465
results = podmanTest.Podman([]string{"logs", cid})
6566
results.WaitWithDefaultTimeout()
@@ -81,6 +82,7 @@ var _ = Describe("Podman logs", func() {
8182
wait.WaitWithDefaultTimeout()
8283
Expect(wait).To(ExitCleanly())
8384

85+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
8486
Eventually(func(g Gomega) {
8587
results := podmanTest.Podman([]string{"logs", "--tail", "2", cid})
8688
results.WaitWithDefaultTimeout()
@@ -121,6 +123,7 @@ var _ = Describe("Podman logs", func() {
121123
wait.WaitWithDefaultTimeout()
122124
Expect(wait).To(ExitCleanly())
123125

126+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
124127
Eventually(func(g Gomega) {
125128
results := podmanTest.Podman([]string{"logs", "--tail", "99", name})
126129
results.WaitWithDefaultTimeout()
@@ -153,6 +156,7 @@ var _ = Describe("Podman logs", func() {
153156
wait.WaitWithDefaultTimeout()
154157
Expect(wait).To(ExitCleanly())
155158

159+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
156160
Eventually(func(g Gomega) {
157161
results := podmanTest.Podman([]string{"logs", "--tail", "800", cid})
158162
results.WaitWithDefaultTimeout()
@@ -173,6 +177,7 @@ var _ = Describe("Podman logs", func() {
173177
wait.WaitWithDefaultTimeout()
174178
Expect(wait).To(ExitCleanly())
175179

180+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
176181
Eventually(func(g Gomega) {
177182
results := podmanTest.Podman([]string{"logs", "--tail", "2", "-t", cid})
178183
results.WaitWithDefaultTimeout()
@@ -193,6 +198,7 @@ var _ = Describe("Podman logs", func() {
193198
wait.WaitWithDefaultTimeout()
194199
Expect(wait).To(ExitCleanly())
195200

201+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
196202
Eventually(func(g Gomega) {
197203
results := podmanTest.Podman([]string{"logs", "--since", "2017-08-07T10:10:09.056611202-04:00", cid})
198204
results.WaitWithDefaultTimeout()
@@ -213,6 +219,7 @@ var _ = Describe("Podman logs", func() {
213219
wait.WaitWithDefaultTimeout()
214220
Expect(wait).To(ExitCleanly())
215221

222+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
216223
Eventually(func(g Gomega) {
217224
results := podmanTest.Podman([]string{"logs", "--since", "10m", cid})
218225
results.WaitWithDefaultTimeout()
@@ -233,6 +240,7 @@ var _ = Describe("Podman logs", func() {
233240
wait.WaitWithDefaultTimeout()
234241
Expect(wait).To(ExitCleanly())
235242

243+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
236244
Eventually(func(g Gomega) {
237245
results := podmanTest.Podman([]string{"logs", "--until", "10m", cid})
238246
results.WaitWithDefaultTimeout()
@@ -253,6 +261,7 @@ var _ = Describe("Podman logs", func() {
253261
wait.WaitWithDefaultTimeout()
254262
Expect(wait).To(ExitCleanly())
255263

264+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
256265
Eventually(func(g Gomega) {
257266
now := time.Now()
258267
now = now.Add(time.Minute * 1)
@@ -391,6 +400,7 @@ var _ = Describe("Podman logs", func() {
391400
Expect(inspect).To(ExitCleanly())
392401
Expect(inspect.OutputToString()).To(Equal("10kB"))
393402

403+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
394404
Eventually(func(g Gomega) {
395405
results := podmanTest.Podman([]string{"logs", cid})
396406
results.WaitWithDefaultTimeout()
@@ -410,6 +420,7 @@ var _ = Describe("Podman logs", func() {
410420
wait.WaitWithDefaultTimeout()
411421
Expect(wait).To(ExitCleanly())
412422

423+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
413424
Eventually(func(g Gomega) {
414425
results := podmanTest.Podman([]string{"logs", "test"})
415426
results.WaitWithDefaultTimeout()
@@ -433,6 +444,7 @@ var _ = Describe("Podman logs", func() {
433444
wait.WaitWithDefaultTimeout()
434445
Expect(wait).To(ExitCleanly())
435446

447+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
436448
Eventually(func(g Gomega) {
437449
results := podmanTest.Podman([]string{"logs", cname})
438450
results.WaitWithDefaultTimeout()
@@ -455,6 +467,7 @@ var _ = Describe("Podman logs", func() {
455467
// However this test must make sure that there is no such extra newline.
456468
Expect(string(logc.Out.Contents())).To(Equal(content))
457469

470+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
458471
Eventually(func(g Gomega) {
459472
logs := podmanTest.Podman([]string{"logs", cname})
460473
logs.WaitWithDefaultTimeout()
@@ -489,6 +502,7 @@ var _ = Describe("Podman logs", func() {
489502
ctr.WaitWithDefaultTimeout()
490503
Expect(ctr).To(ExitCleanly())
491504

505+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
492506
Eventually(func(g Gomega) {
493507
results := podmanTest.Podman([]string{"pod", "logs", "-l"})
494508
results.WaitWithDefaultTimeout()
@@ -524,6 +538,7 @@ var _ = Describe("Podman logs", func() {
524538
log2.WaitWithDefaultTimeout()
525539
Expect(log2).To(ExitCleanly())
526540

541+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
527542
Eventually(func(g Gomega) {
528543
results := podmanTest.Podman([]string{"pod", "logs", "-l"})
529544
results.WaitWithDefaultTimeout()
@@ -546,6 +561,7 @@ var _ = Describe("Podman logs", func() {
546561
wait.WaitWithDefaultTimeout()
547562
Expect(wait).To(ExitCleanly())
548563

564+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
549565
Eventually(func(g Gomega) {
550566
cmd := exec.Command("journalctl", "--no-pager", "-o", "json", "--output-fields=CONTAINER_TAG", fmt.Sprintf("CONTAINER_ID_FULL=%s", cid))
551567
out, err := cmd.CombinedOutput()
@@ -566,6 +582,7 @@ var _ = Describe("Podman logs", func() {
566582
wait.WaitWithDefaultTimeout()
567583
Expect(wait).To(ExitCleanly())
568584

585+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
569586
Eventually(func(g Gomega) {
570587
cmd := exec.Command("journalctl", "--no-pager", "-o", "json", "--output-fields=CONTAINER_NAME", fmt.Sprintf("CONTAINER_ID_FULL=%s", cid))
571588
out, err := cmd.CombinedOutput()
@@ -632,6 +649,7 @@ var _ = Describe("Podman logs", func() {
632649
log2.WaitWithDefaultTimeout()
633650
Expect(log2).To(ExitCleanly())
634651

652+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
635653
Eventually(func(g Gomega) {
636654
results := podmanTest.Podman([]string{"pod", "logs", "--names", podName})
637655
results.WaitWithDefaultTimeout()
@@ -658,6 +676,7 @@ var _ = Describe("Podman logs", func() {
658676
log2.WaitWithDefaultTimeout()
659677
Expect(log2).To(ExitCleanly())
660678

679+
//nolint:ginkgolinter // false positive https://github.com/golangci/golangci-lint/issues/5398
661680
Eventually(func(g Gomega) {
662681
results := podmanTest.Podman([]string{"pod", "logs", "--color", podName})
663682
results.WaitWithDefaultTimeout()

0 commit comments

Comments
 (0)