cmds/fmap: cleanup tests (#431)

Signed-off-by: Siarhiej Siemianczuk <[email protected]>
linuxboot · Sep 17, 2024 · 98cc60b · 98cc60b
1 parent b3968fa
commit 98cc60b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/cmds/fmap/fmap_test.go b/cmds/fmap/fmap_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/u-root/u-root/pkg/testutil"
 )
 
-const testFlash = "fake_test.flash"
+const testFlash = "testdata/fake_test.flash"
 
 var tests = []struct {
 	cmd string
@@ -64,19 +64,15 @@ func TestFmap(t *testing.T) {
 		}
 
 		// Filter out null characters which may be present in fmap strings.
-		out = bytes.Replace(out, []byte{0}, []byte{}, -1)
+		out = bytes.ReplaceAll(out, []byte{0}, []byte{})
 		if string(out) != tt.out {
 			t.Errorf("expected:\n%s\ngot:\n%s", tt.out, string(out))
 		}
 	}
 }
 
 func TestJson(t *testing.T) {
-	tmpDir, err := os.MkdirTemp("", "fmap_json")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpDir)
+	tmpDir := t.TempDir()
 
 	jsonFile := filepath.Join(tmpDir, "tmp.json")
 	if err := testutil.Command(t, "jget", jsonFile, testFlash).Run(); err != nil {

diff --git a/cmds/fmap/fake_test.flash → cmds/fmap/testdata/fake_test.flash b/cmds/fmap/fake_test.flash → cmds/fmap/testdata/fake_test.flash