3 files changed, 15 insertions, 9 deletions
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)
 }