Merge pull request moby#5799 from tonistiigi/lint-error-combine

dockerfile: combine lint error testing into single variable

Author: crazy-max

frontend/dockerfile/dockerfile_lint_test.go

@@ -397,9 +397,8 @@ copy Dockerfile .
 				Level:       1,
 			},
 		},
-		StreamBuildErr:    "failed to solve: lint violation found for rules: FromAsCasing",
-		UnmarshalBuildErr: "lint violation found for rules: FromAsCasing",
-		BuildErrLocation:  2,
+		BuildErr:         "lint violation found for rules: FromAsCasing",
+		BuildErrLocation: 2,
 	})
 
 	dockerfile = []byte(`#check=skip=all
@@ -418,9 +417,8 @@ copy Dockerfile .
 				Level:       1,
 			},
 		},
-		StreamBuildErr:    "failed to solve: lint violation found for rules: FromAsCasing",
-		UnmarshalBuildErr: "lint violation found for rules: FromAsCasing",
-		BuildErrLocation:  2,
+		BuildErr:         "lint violation found for rules: FromAsCasing",
+		BuildErrLocation: 2,
 		FrontendAttrs: map[string]string{
 			"build-arg:BUILDKIT_DOCKERFILE_CHECK": "skip=ConsistentInstructionCasing;error=true",
 		},
@@ -858,9 +856,8 @@ BADCMD
 				Line:        3,
 			},
 		},
-		StreamBuildErr:    "failed to solve: dockerfile parse error on line 4: unknown instruction: BADCMD",
-		UnmarshalBuildErr: "dockerfile parse error on line 4: unknown instruction: BADCMD",
-		BuildErrLocation:  4,
+		BuildErr:         "dockerfile parse error on line 4: unknown instruction: BADCMD",
+		BuildErrLocation: 4,
 	})
 }
 
@@ -922,9 +919,8 @@ COPY Dockerfile .
 				Line:        2,
 			},
 		},
-		StreamBuildErr:    "failed to solve: empty platform value from expression $BULIDPLATFORM (did you mean BUILDPLATFORM?)",
-		UnmarshalBuildErr: "empty platform value from expression $BULIDPLATFORM (did you mean BUILDPLATFORM?)",
-		BuildErrLocation:  2,
+		BuildErr:         "empty platform value from expression $BULIDPLATFORM (did you mean BUILDPLATFORM?)",
+		BuildErrLocation: 2,
 	})
 
 	osName := integration.UnixOrWindows("linux", "windows")
@@ -939,10 +935,7 @@ COPY Dockerfile .
 		osName, osName, baseImg))
 
 	osStr := integration.UnixOrWindows("linux", "windows")
-	streamBuildErr := fmt.Sprintf(
-		"failed to solve: failed to parse platform %s/${MYARCH}: \"\" is an invalid component of \"%s/\": platform specifier component must match \"^[A-Za-z0-9_.-]+$\": invalid argument (did you mean MY_ARCH?)",
-		osStr, osStr)
-	unmarshalBuildErr := fmt.Sprintf(
+	buildErr := fmt.Sprintf(
 		"failed to parse platform %s/${MYARCH}: \"\" is an invalid component of \"%s/\": platform specifier component must match \"^[A-Za-z0-9_.-]+$\": invalid argument (did you mean MY_ARCH?)",
 		osStr, osStr)
 	checkLinterWarnings(t, sb, &lintTestParams{
@@ -957,9 +950,8 @@ COPY Dockerfile .
 				Line:        4,
 			},
 		},
-		StreamBuildErr:    streamBuildErr,
-		UnmarshalBuildErr: unmarshalBuildErr,
-		BuildErrLocation:  4,
+		BuildErr:         buildErr,
+		BuildErrLocation: 4,
 	})
 
 	dockerfile = []byte(fmt.Sprintf(
@@ -1470,12 +1462,12 @@ func checkUnmarshal(t *testing.T, sb integration.Sandbox, lintTest *lintTestPara
 		lintResults, err := unmarshalLintResults(res)
 		require.NoError(t, err)
 
-		if lintTest.UnmarshalBuildErr == "" && lintTest.UnmarshalBuildErrRegexp == nil {
+		if lintTest.BuildErr == "" && lintTest.UnmarshalBuildErrRegexp == nil {
 			require.Nil(t, lintResults.Error)
 		} else {
 			require.NotNil(t, lintResults.Error)
-			if lintTest.UnmarshalBuildErr != "" {
-				require.Equal(t, lintTest.UnmarshalBuildErr, lintResults.Error.Message)
+			if lintTest.BuildErr != "" {
+				require.Equal(t, lintTest.BuildErr, lintResults.Error.Message)
 			} else if !lintTest.UnmarshalBuildErrRegexp.MatchString(lintResults.Error.Message) {
 				t.Fatalf("error %q does not match %q", lintResults.Error.Message, lintTest.UnmarshalBuildErrRegexp.String())
 			}
@@ -1562,14 +1554,14 @@ func checkProgressStream(t *testing.T, sb integration.Sandbox, lintTest *lintTes
 			dockerui.DefaultLocalNameContext:    lintTest.TmpDir,
 		},
 	}, status)
-	if lintTest.StreamBuildErr == "" && lintTest.StreamBuildErrRegexp == nil {
+	if lintTest.BuildErr == "" && lintTest.StreamBuildErrRegexp == nil {
 		if err != nil {
 			t.Logf("expected no error, received: %v", err)
 		}
 		require.NoError(t, err)
 	} else {
-		if lintTest.StreamBuildErr != "" {
-			require.EqualError(t, err, lintTest.StreamBuildErr)
+		if lintTest.BuildErr != "" {
+			require.ErrorContains(t, err, lintTest.BuildErr)
 		} else if !lintTest.StreamBuildErrRegexp.MatchString(err.Error()) {
 			t.Fatalf("error %q does not match %q", err.Error(), lintTest.StreamBuildErrRegexp.String())
 		}
@@ -1695,9 +1687,8 @@ type lintTestParams struct {
 	DockerIgnore            []byte
 	Warnings                []expectedLintWarning
 	UnmarshalWarnings       []expectedLintWarning
-	StreamBuildErr          string
+	BuildErr                string
 	StreamBuildErrRegexp    *regexp.Regexp
-	UnmarshalBuildErr       string
 	UnmarshalBuildErrRegexp *regexp.Regexp
 	BuildErrLocation        int32
 	FrontendAttrs           map[string]string