fix(initrd): Remove the rootfs directly from the testdata directory (#…

…2066) Reviewed-by: Cezar Craciunoiu <[email protected]> Approved-by: Cezar Craciunoiu <[email protected]>
unikraft · Jan 13, 2025 · 7faf749 · 7faf749
2 parents 396dfdf + 75d18dd
commit 7faf749
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/initrd/directory_test.go b/initrd/directory_test.go
@@ -10,16 +10,19 @@ import (
 	"os"
 	"testing"
 
+	"kraftkit.sh/archive"
 	"kraftkit.sh/cpio"
 	"kraftkit.sh/initrd"
 )
 
 func TestNewFromDirectory(t *testing.T) {
-	const rootDir = "testdata/rootfs"
+	if err := archive.Unarchive("testdata/rootfs.tar.gz", "testdata/rootfs"); err != nil {
+		t.Fatal("Unarchive:", err)
+	}
 
 	ctx := context.Background()
 
-	ird, err := initrd.NewFromDirectory(ctx, rootDir)
+	ird, err := initrd.NewFromDirectory(ctx, "testdata/rootfs")
 	if err != nil {
 		t.Fatal("NewFromDirectory:", err)
 	}
@@ -32,6 +35,9 @@ func TestNewFromDirectory(t *testing.T) {
 		if err := os.Remove(irdPath); err != nil {
 			t.Fatal("Failed to remove initrd file:", err)
 		}
+		if err := os.RemoveAll("testdata/rootfs"); err != nil {
+			t.Fatal("Failed to remove rootfs directory:", err)
+		}
 	})
 
 	r := cpio.NewReader(openFile(t, irdPath))

diff --git a/initrd/testdata/rootfs/a/b/c/d b/initrd/testdata/rootfs/a/b/c/d
diff --git a/initrd/testdata/rootfs/a/b/c/e-symlink b/initrd/testdata/rootfs/a/b/c/e-symlink
diff --git a/initrd/testdata/rootfs/a/b/c/f-hardlink b/initrd/testdata/rootfs/a/b/c/f-hardlink
diff --git a/initrd/testdata/rootfs/a/b/c/g-recursive-symlink b/initrd/testdata/rootfs/a/b/c/g-recursive-symlink