From 11b26e7e8cad60651a9b769ca07fcef4ee0dbe04 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Fri, 29 Sep 2023 14:57:11 +0200 Subject: [PATCH] added symlink testing Signed-off-by: Christian Goll --- internal/pkg/kernel/kernel_test.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/internal/pkg/kernel/kernel_test.go b/internal/pkg/kernel/kernel_test.go index e5b12128..8f5c03c9 100644 --- a/internal/pkg/kernel/kernel_test.go +++ b/internal/pkg/kernel/kernel_test.go @@ -28,12 +28,20 @@ func Test_BuildKernel(t *testing.T) { defer os.RemoveAll(srvDir) conf := warewulfconf.Get() conf.Paths.WWProvisiondir = srvDir - kernelDir, err := os.MkdirTemp(os.TempDir(), "ww-test-kernelImage-*") + kernelDir, err := os.MkdirTemp(os.TempDir(), "ww-test-kernel-*") assert.NoError(t, err) defer os.RemoveAll(kernelDir) { err = os.MkdirAll(path.Join(kernelDir, "boot"), 0755) assert.NoError(t, err) + err = os.MkdirAll(path.Join(kernelDir, "lib/modules/old-kernel"), 0755) + assert.NoError(t, err) + _, err = os.Create(path.Join(kernelDir, "lib/modules/old-kernel/old-module")) + assert.NoError(t, err) + err = os.MkdirAll(path.Join(kernelDir, "lib/firmware"), 0755) + assert.NoError(t, err) + _, err = os.Create(path.Join(kernelDir, "lib/firmware/test-firmware")) + assert.NoError(t, err) for _, tt := range kernelBuildTests { _, err = os.Create(path.Join(kernelDir, "boot", tt.kernelFileName)) assert.NoError(t, err) @@ -41,9 +49,7 @@ func Test_BuildKernel(t *testing.T) { assert.NoError(t, err) _, err = os.Create(path.Join(kernelDir, "lib/modules", tt.kernelVersion, "test-module")) assert.NoError(t, err) - err = os.MkdirAll(path.Join(kernelDir, "lib/firmware"), 0755) - assert.NoError(t, err) - _, err = os.Create(path.Join(kernelDir, "lib/firmware/test-firmware")) + err = os.Symlink(path.Join(kernelDir, "lib/modules/old-kernel/old-module"), path.Join(kernelDir, "lib/modules", tt.kernelVersion, "symlink-module")) assert.NoError(t, err) } } @@ -57,7 +63,7 @@ func Test_BuildKernel(t *testing.T) { assert.FileExists(t, path.Join(srvDir, "kernel", tt.kernelName, "kmods.img")) files, err := util.CpioFiles(path.Join(srvDir, "kernel", tt.kernelName, "kmods.img")) assert.NoError(t, err) - assert.Equal(t, files, []string{"lib/firmware/test-firmware", "lib/modules/1.2.3.4/test-module"}) + assert.Equal(t, files, []string{"lib/firmware/test-firmware", "lib/modules/1.2.3.4/symlink-module", "lib/modules/1.2.3.4/test-module"}) } else { assert.Error(t, err) }