Merge pull request #13580 from vrothberg/enable-linters

enable linters

9 files changed, 37 insertions, 28 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"})
diff --git a/test/utils/common_function_test.go b/test/utils/common_function_test.go
index 810d9f2a5..6323b44eb 100644
--- a/test/utils/common_function_test.go
+++ b/test/utils/common_function_test.go
@@ -51,7 +51,8 @@ var _ = Describe("Common functions test", func() {
 			txt := fmt.Sprintf("ID=%s\nVERSION_ID=%s", id, ver)
 			if !empty {
 				f, _ := os.Create(path)
-				f.WriteString(txt)
+				_, err := f.WriteString(txt)
+				Expect(err).To(BeNil(), "Failed to write data.")
 				f.Close()
 			}
 
@@ -102,9 +103,10 @@ var _ = Describe("Common functions test", func() {
 			Item2: []string{"test"},
 		}
 
-		testByte, _ := json.Marshal(testData)
-		err := WriteJSONFile(testByte, "/tmp/testJSON")
+		testByte, err := json.Marshal(testData)
+		Expect(err).To(BeNil(), "Failed to marshal data.")
 
+		err = WriteJSONFile(testByte, "/tmp/testJSON")
 		Expect(err).To(BeNil(), "Failed to write JSON to file.")
 
 		read, err := os.Open("/tmp/testJSON")
@@ -135,7 +137,8 @@ var _ = Describe("Common functions test", func() {
 			}
 			if createFile {
 				f, _ := os.Create(path)
-				f.WriteString(txt)
+				_, err := f.WriteString(txt)
+				Expect(err).To(BeNil(), "Failed to write data.")
 				f.Close()
 			}
 			ProcessOneCgroupPath = path
diff --git a/test/utils/matchers.go b/test/utils/matchers.go
index 288779b63..0c0948e4b 100644
--- a/test/utils/matchers.go
+++ b/test/utils/matchers.go
@@ -13,7 +13,7 @@ import (
 	"github.com/onsi/gomega/types"
 )
 
-// HaveActiveService verifies the given service is the active service
+// HaveActiveService verifies the given service is the active service.
 func HaveActiveService(name interface{}) OmegaMatcher {
 	return WithTransform(
 		func(cfg *config.Config) string {
@@ -86,7 +86,7 @@ type URLMatcher struct {
 	matchers.EqualMatcher
 }
 
-// VerifyURL matches when actual is a valid URL and matches expected
+// VerifyURL matches when actual is a valid URL and matches expected.
 func VerifyURL(uri interface{}) OmegaMatcher {
 	return &URLMatcher{matchers.EqualMatcher{Expected: uri}}
 }
@@ -129,7 +129,7 @@ func ExitWithError(optionalExitCode ...int) *ExitMatcher {
 	return &ExitMatcher{Expected: exitCode}
 }
 
-// Match follows gexec.Matcher interface
+// Match follows gexec.Matcher interface.
 func (matcher *ExitMatcher) Match(actual interface{}) (success bool, err error) {
 	exiter, ok := actual.(gexec.Exiter)
 	if !ok {
@@ -184,7 +184,7 @@ func (matcher *ValidJSONMatcher) Match(actual interface{}) (success bool, err er
 
 	var i interface{}
 	if err := json.Unmarshal([]byte(s), &i); err != nil {
-		return false, nil
+		return false, err
 	}
 	return true, nil
 }
diff --git a/test/utils/utils.go b/test/utils/utils.go
index 8fe45dca0..a6295cd19 100644
--- a/test/utils/utils.go
+++ b/test/utils/utils.go
@@ -479,7 +479,10 @@ func IsCommandAvailable(command string) bool {
 func WriteJSONFile(data []byte, filePath string) error {
 	var jsonData map[string]interface{}
 	json.Unmarshal(data, &jsonData)
-	formatJSON, _ := json.MarshalIndent(jsonData, "", "	")
+	formatJSON, err := json.MarshalIndent(jsonData, "", "	")
+	if err != nil {
+		return err
+	}
 	return ioutil.WriteFile(filePath, formatJSON, 0644)
 }