Merge pull request #13580 from vrothberg/enable-linters

enable linters

6 files changed, 22 insertions, 19 deletions

diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go
index a7af76529..74e3a619a 100644
--- a/test/e2e/attach_test.go
+++ b/test/e2e/attach_test.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"os"
 	"syscall"
 	"time"
 
@@ -20,12 +19,11 @@ var _ = Describe("Podman attach", func() {
 
 	BeforeEach(func() {
 		tempdir, err = CreateTempDirInTempDir()
-		if err != nil {
-			os.Exit(1)
-		}
+		Expect(err).To(BeNil())
 		podmanTest = PodmanTestCreate(tempdir)
 		podmanTest.Setup()
-		podmanTest.SeedImages()
+		err = podmanTest.SeedImages()
+		Expect(err).To(BeNil())
 	})
 
 	AfterEach(func() {
diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go
index 5abc672e9..7b2dd89c9 100644
--- a/test/e2e/checkpoint_test.go
+++ b/test/e2e/checkpoint_test.go
@@ -37,12 +37,12 @@ var _ = Describe("Podman checkpoint", func() {
 	BeforeEach(func() {
 		SkipIfRootless("checkpoint not supported in rootless mode")
 		tempdir, err = CreateTempDirInTempDir()
-		if err != nil {
-			os.Exit(1)
-		}
+		Expect(err).To(BeNil())
+
 		podmanTest = PodmanTestCreate(tempdir)
 		podmanTest.Setup()
-		podmanTest.SeedImages()
+		err = podmanTest.SeedImages()
+		Expect(err).To(BeNil())
 		// Check if the runtime implements checkpointing. Currently only
 		// runc's checkpoint/restore implementation is supported.
 		cmd := exec.Command(podmanTest.OCIRuntime, "checkpoint", "--help")
diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go
index 6bcf17bfe..78b607f1e 100644
--- a/test/e2e/commit_test.go
+++ b/test/e2e/commit_test.go
@@ -21,12 +21,11 @@ var _ = Describe("Podman commit", func() {
 
 	BeforeEach(func() {
 		tempdir, err = CreateTempDirInTempDir()
-		if err != nil {
-			os.Exit(1)
-		}
+		Expect(err).To(BeNil())
 		podmanTest = PodmanTestCreate(tempdir)
 		podmanTest.Setup()
-		podmanTest.SeedImages()
+		err = podmanTest.SeedImages()
+		Expect(err).To(BeNil())
 	})
 
 	AfterEach(func() {
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index bc6d89fad..cb6574f23 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -809,7 +809,8 @@ func (p *PodmanTestIntegration) RestoreArtifactToCache(image string) error {
 
 func populateCache(podman *PodmanTestIntegration) {
 	for _, image := range CACHE_IMAGES {
-		podman.RestoreArtifactToCache(image)
+		err := podman.RestoreArtifactToCache(image)
+		Expect(err).To(BeNil())
 	}
 	// logformatter uses this to recognize the first test
 	fmt.Printf("-----------------------------\n")
diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go
index 339fa66d8..4c3b5604a 100644
--- a/test/e2e/create_test.go
+++ b/test/e2e/create_test.go
@@ -24,12 +24,11 @@ var _ = Describe("Podman create", func() {
 
 	BeforeEach(func() {
 		tempdir, err = CreateTempDirInTempDir()
-		if err != nil {
-			os.Exit(1)
-		}
+		Expect(err).To(BeNil())
 		podmanTest = PodmanTestCreate(tempdir)
 		podmanTest.Setup()
-		podmanTest.SeedImages()
+		err = podmanTest.SeedImages()
+		Expect(err).To(BeNil())
 	})
 
 	AfterEach(func() {
diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go
index 3943a5e87..bb5a3a6ad 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"})
@@ -94,7 +95,8 @@ var _ = Describe("Podman inspect", func() {
 	})
 
 	It("podman inspect container with size", func() {
-		_, ec, _ := podmanTest.RunLsContainer("sizetest")
+		session, ec, _ := podmanTest.RunLsContainer("sizetest")
+		session.WaitWithDefaultTimeout()
 		Expect(ec).To(Equal(0))
 
 		result := podmanTest.Podman([]string{"inspect", "--size", "sizetest"})
@@ -107,6 +109,7 @@ var _ = Describe("Podman inspect", func() {
 
 	It("podman inspect container and image", func() {
 		ls, ec, _ := podmanTest.RunLsContainer("")
+		ls.WaitWithDefaultTimeout()
 		Expect(ec).To(Equal(0))
 		cid := ls.OutputToString()
 
@@ -118,6 +121,7 @@ var _ = Describe("Podman inspect", func() {
 
 	It("podman inspect container and filter for Image{ID}", func() {
 		ls, ec, _ := podmanTest.RunLsContainer("")
+		ls.WaitWithDefaultTimeout()
 		Expect(ec).To(Equal(0))
 		cid := ls.OutputToString()
 
@@ -134,6 +138,7 @@ var _ = Describe("Podman inspect", func() {
 
 	It("podman inspect container and filter for CreateCommand", func() {
 		ls, ec, _ := podmanTest.RunLsContainer("")
+		ls.WaitWithDefaultTimeout()
 		Expect(ec).To(Equal(0))
 		cid := ls.OutputToString()
 
@@ -529,6 +534,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"})