summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Rothberg <vrothberg@redhat.com>2022-03-21 13:50:55 +0100
committerValentin Rothberg <vrothberg@redhat.com>2022-03-22 13:04:35 +0100
commitfb792f7ed40eb319a3e99274584bf3f5076a43e5 (patch)
tree1ad29aaff458eba9a891a2d64fa8cc4974e4d414
parentf72a678f2a06697ff42e1fe5636cb09b47a25b49 (diff)
downloadpodman-fb792f7ed40eb319a3e99274584bf3f5076a43e5.tar.gz
podman-fb792f7ed40eb319a3e99274584bf3f5076a43e5.tar.bz2
podman-fb792f7ed40eb319a3e99274584bf3f5076a43e5.zip
linter: enable ineffassign
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
-rw-r--r--.golangci.yml1
-rw-r--r--test/e2e/inspect_test.go2
2 files changed, 2 insertions, 1 deletions
diff --git a/.golangci.yml b/.golangci.yml
index a27d96bcf..42692ad77 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -58,7 +58,6 @@ linters:
- cyclop
- errname
- forcetypeassert
- - ineffassign
- ireturn
- tagliatelle
- varnamelen
diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go
index 3943a5e87..08bdc9488 100644
--- a/test/e2e/inspect_test.go
+++ b/test/e2e/inspect_test.go
@@ -86,6 +86,7 @@ var _ = Describe("Podman inspect", func() {
It("podman inspect container with GO format for ConmonPidFile", func() {
session, ec, _ := podmanTest.RunLsContainer("test1")
+ session.WaitWithDefaultTimeout()
Expect(ec).To(Equal(0))
session = podmanTest.Podman([]string{"inspect", "--format", "{{.ConmonPidFile}}", "test1"})
@@ -529,6 +530,7 @@ var _ = Describe("Podman inspect", func() {
It("podman inspect container with GO format for PidFile", func() {
SkipIfRemote("pidfile not handled by remote")
session, ec, _ := podmanTest.RunLsContainer("test1")
+ session.WaitWithDefaultTimeout()
Expect(ec).To(Equal(0))
session = podmanTest.Podman([]string{"inspect", "--format", "{{.PidFile}}", "test1"})