test: use integration.Tmpdir consistently

Signed-off-by: Justin Chadwell <[email protected]>

Author: jedevc

cmd/buildctl/build_test.go

@@ -23,11 +23,10 @@ import (
 )
 
 func testBuildWithLocalFiles(t *testing.T, sb integration.Sandbox) {
-	dir, err := tmpdir(
+	dir := integration.Tmpdir(
 		t,
 		fstest.CreateFile("foo", []byte("bar"), 0600),
 	)
-	require.NoError(t, err)
 
 	st := llb.Image("busybox").
 		Run(llb.Shlex("sh -c 'echo -n bar > foo2'")).
@@ -185,11 +184,3 @@ func marshal(ctx context.Context, st llb.State) (io.Reader, error) {
 	}
 	return bytes.NewBuffer(dt), nil
 }
-
-func tmpdir(t *testing.T, appliers ...fstest.Applier) (string, error) {
-	tmpdir := t.TempDir()
-	if err := fstest.Apply(appliers...).Apply(tmpdir); err != nil {
-		return "", err
-	}
-	return tmpdir, nil
-}

frontend/frontend_test.go

@@ -67,11 +67,10 @@ func testRefReadFile(t *testing.T, sb integration.Sandbox) {
 
 	testcontent := []byte(`foobar`)
 
-	dir, err := tmpdir(
+	dir := integration.Tmpdir(
 		t,
 		fstest.CreateFile("test", testcontent, 0666),
 	)
-	require.NoError(t, err)
 
 	frontend := func(ctx context.Context, c gateway.Client) (*gateway.Result, error) {
 		def, err := llb.Local("mylocal").Marshal(ctx)
@@ -130,7 +129,7 @@ func testRefReadDir(t *testing.T, sb integration.Sandbox) {
 	require.NoError(t, err)
 	defer c.Close()
 
-	dir, err := tmpdir(
+	dir := integration.Tmpdir(
 		t,
 		fstest.CreateDir("somedir", 0777),
 		fstest.CreateFile("somedir/foo1.txt", []byte(`foo1`), 0666),
@@ -139,7 +138,6 @@ func testRefReadDir(t *testing.T, sb integration.Sandbox) {
 		fstest.Symlink("bar.log", "somedir/link.log"),
 		fstest.CreateDir("somedir/baz.dir", 0777),
 	)
-	require.NoError(t, err)
 
 	expMap := make(map[string]*fstypes.Stat)
 
@@ -248,11 +246,10 @@ func testRefStatFile(t *testing.T, sb integration.Sandbox) {
 
 	testcontent := []byte(`foobar`)
 
-	dir, err := tmpdir(
+	dir := integration.Tmpdir(
 		t,
 		fstest.CreateFile("test", testcontent, 0666),
 	)
-	require.NoError(t, err)
 
 	exp, err := fsutil.Stat(filepath.Join(dir, "test"))
 	require.NoError(t, err)
@@ -340,11 +337,3 @@ func testRefEvaluate(t *testing.T, sb integration.Sandbox) {
 	_, err = c.Build(ctx, client.SolveOpt{}, "", frontend, nil)
 	require.NoError(t, err)
 }
-
-func tmpdir(t *testing.T, appliers ...fstest.Applier) (string, error) {
-	tmpdir := t.TempDir()
-	if err := fstest.Apply(appliers...).Apply(tmpdir); err != nil {
-		return "", err
-	}
-	return tmpdir, nil
-}