Update integration test for checking empty dockerfile arg behavior and move from linting tests

Signed-off-by: Talon Bowler <[email protected]>

Author: daghack

frontend/dockerfile/dockerfile_lint_test.go

@@ -786,20 +786,6 @@ ENV PATH=$PAHT:/tmp/bin
 			},
 		},
 	})
-
-	dockerfile = []byte(`
-FROM alpine
-ARG FOO
-ARG BAR=
-RUN env | grep 'BAR='
-RUN env | grep 'FOO='
-`)
-	checkLinterWarnings(t, sb, &lintTestParams{
-		Dockerfile:        dockerfile,
-		StreamBuildErr:    `failed to solve: process "/bin/sh -c env | grep 'FOO='" did not complete successfully: exit code: 1`,
-		UnmarshalBuildErr: `process "/bin/sh -c env | grep 'FOO='" did not complete successfully: exit code: 1`,
-		BuildErrLocation:  6,
-	})
 }
 
 func testMultipleInstructionsDisallowed(t *testing.T, sb integration.Sandbox) {

frontend/dockerfile/dockerfile_test.go

@@ -185,6 +185,7 @@ var allTests = integration.TestFuncs(
 	testFrontendDeduplicateSources,
 	testDuplicateLayersProvenance,
 	testSourcePolicyWithNamedContext,
+	testEmptyStringArgInEnv,
 )
 
 // Tests that depend on the `security.*` entitlements
@@ -263,6 +264,50 @@ func TestIntegration(t *testing.T) {
 	)...)
 }
 
+func testEmptyStringArgInEnv(t *testing.T, sb integration.Sandbox) {
+	integration.SkipOnPlatform(t, "windows")
+	f := getFrontend(t, sb)
+
+	dockerfile := []byte(`
+FROM busybox AS build
+ARG FOO
+ARG BAR=
+RUN env > env.txt
+
+FROM scratch
+COPY --from=build env.txt .
+`)
+	dir := integration.Tmpdir(
+		t,
+		fstest.CreateFile("Dockerfile", dockerfile, 0600),
+	)
+	c, err := client.New(sb.Context(), sb.Address())
+	require.NoError(t, err)
+	defer c.Close()
+
+	destDir := t.TempDir()
+	_, err = f.Solve(sb.Context(), c, client.SolveOpt{
+		Exports: []client.ExportEntry{
+			{
+				Type:      client.ExporterLocal,
+				OutputDir: destDir,
+			},
+		},
+		LocalMounts: map[string]fsutil.FS{
+			dockerui.DefaultLocalNameDockerfile: dir,
+			dockerui.DefaultLocalNameContext:    dir,
+		},
+	}, nil)
+	require.NoError(t, err)
+
+	dt, err := os.ReadFile(filepath.Join(destDir, "env.txt"))
+	require.NoError(t, err)
+
+	envStr := string(dt)
+	require.Contains(t, envStr, "BAR=")
+	require.NotContains(t, envStr, "FOO=")
+}
+
 func testDefaultEnvWithArgs(t *testing.T, sb integration.Sandbox) {
 	integration.SkipOnPlatform(t, "windows")
 	f := getFrontend(t, sb)