Add tests for kernel versions containing +
Signed-off-by: Christian Goll <cgoll@suse.com>
This commit is contained in:
committed by
Jonathon Anderson
parent
1c7fdf504f
commit
2dfd28cb6c
@@ -19,30 +19,29 @@ var kernelBuildTests = []struct {
|
||||
}{
|
||||
{"4.3.2.1", "kernel1", "vmlinuz-1.2.3.4.gz", false},
|
||||
{"1.2.3.4", "kernel1", "vmlinuz-1.2.3.4.gz", true},
|
||||
{"1.2+3+4", "kernel1", "vmlinuz-1.2+3+4.gz", true},
|
||||
}
|
||||
|
||||
func Test_BuildKernel(t *testing.T) {
|
||||
wwlog.SetLogLevel(wwlog.DEBUG)
|
||||
srvDir, err := os.MkdirTemp(os.TempDir(), "ww-test-srv-*")
|
||||
assert.NoError(t, err)
|
||||
defer os.RemoveAll(srvDir)
|
||||
conf := warewulfconf.Get()
|
||||
conf.Paths.WWProvisiondir = srvDir
|
||||
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)
|
||||
for _, tt := range kernelBuildTests {
|
||||
srvDir, err := os.MkdirTemp(os.TempDir(), "ww-test-srv-*")
|
||||
assert.NoError(t, err)
|
||||
err = os.MkdirAll(path.Join(kernelDir, "lib/modules/old-kernel"), 0755)
|
||||
conf := warewulfconf.Get()
|
||||
conf.Paths.WWProvisiondir = srvDir
|
||||
kernelDir, err := os.MkdirTemp(os.TempDir(), "ww-test-kernel-*")
|
||||
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.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)
|
||||
_, err = os.Create(path.Join(kernelDir, "boot", tt.kernelFileName))
|
||||
assert.NoError(t, err)
|
||||
err = os.MkdirAll(path.Join(kernelDir, "lib/modules", tt.kernelVersion, "/nested"), 0755)
|
||||
@@ -52,8 +51,6 @@ func Test_BuildKernel(t *testing.T) {
|
||||
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)
|
||||
}
|
||||
}
|
||||
for _, tt := range kernelBuildTests {
|
||||
t.Run(tt.kernelName, func(t *testing.T) {
|
||||
err = Build(tt.kernelVersion, tt.kernelName, kernelDir)
|
||||
if tt.succeed {
|
||||
@@ -63,10 +60,16 @@ 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.ElementsMatch(t, files, []string{"lib/firmware/test-firmware", "lib/modules/1.2.3.4/symlink-module", "lib/modules/1.2.3.4/test-module", "lib/modules/1.2.3.4/nested"})
|
||||
assert.ElementsMatch(t, files, []string{
|
||||
"lib/firmware/test-firmware",
|
||||
"lib/modules/" + tt.kernelVersion + "/symlink-module",
|
||||
"lib/modules/" + tt.kernelVersion + "/test-module",
|
||||
"lib/modules/" + tt.kernelVersion + "/nested"})
|
||||
} else {
|
||||
assert.Error(t, err)
|
||||
}
|
||||
})
|
||||
os.RemoveAll(srvDir)
|
||||
os.RemoveAll(kernelDir)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user