hack: enhancement of unit_test check

1. enhancement of unit test function
2. fix go test error
Signed-off-by: NDCCooper <1866858@gmail.com>

cmd/cli/build_test.go

@@ -212,7 +212,7 @@ RUN echo hello world
 	buildOpts.contextDir, _ = os.Getwd()
 	buildOpts.file = tmpDir.Join(filename)
 
-	_, err := readDockerfile()
+	_, _, err := readDockerfile()
 	assert.NilError(t, err)
 }
 
@@ -231,7 +231,7 @@ RUN echo hello world
 	buildOpts.contextDir = tmpDir.Path()
 	buildOpts.file = "testDockerfile"
 
-	_, err := readDockerfile()
+	_, _, err := readDockerfile()
 	assert.NilError(t, err)
 }
 
@@ -250,7 +250,7 @@ RUN echo hello world
 	buildOpts.contextDir = tmpDir.Path()
 	buildOpts.file = ""
 
-	_, err := readDockerfile()
+	_, _, err := readDockerfile()
 	assert.NilError(t, err)
 }
 
@@ -267,7 +267,7 @@ func TestReadDockerfileWithNoContent(t *testing.T) {
 	buildOpts.contextDir = tmpDir.Path()
 	buildOpts.file = filename
 
-	_, err := readDockerfile()
+	_, _, err := readDockerfile()
 	assert.ErrorContains(t, err, "file is empty")
 }
 
@@ -278,7 +278,7 @@ func TestReadDockerfileWithDirectory(t *testing.T) {
 	buildOpts.contextDir = ""
 	buildOpts.file = "."
 
-	_, err := readDockerfile()
+	_, _, err := readDockerfile()
 	assert.ErrorContains(t, err, "should be a regular file")
 }
 

hack/unit_test.sh

@@ -29,7 +29,7 @@ for path in $(go list ./...); do
     echo "Start to test: ${path}"
     # TEST_ARGS is " -args SKIP_REG=foo", so no double quote for it
     go test -mod=vendor -cover -count=1 -timeout 300s -v "${path}" ${TEST_ARGS} >> "${testlog}"
-    cat "${testlog}" | grep -E -- "--- FAIL:"
+    cat "${testlog}" | grep -E -- "--- FAIL:|^FAIL"
     if [ $? -eq 0 ]; then
         echo "Testing failed... Please check ${testlog}"
         exit 1