kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix test to run without NodeInfo

Browse Source 
Also removed --fullall from node list and profile list

Signed-off-by: Christian Goll <cgoll@suse.com>
This commit is contained in:
Christian Goll
2023-12-20 15:52:44 +01:00
committed by Jonathon Anderson
parent ffef31969e
commit ac6cd69ca6
28 changed files with 456 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/pkg/overlay/overlay_test.go
View File

@@ -147,8 +147,7 @@ func Test_BuildOverlay(t *testing.T) {
}
for _, tt := range buildOverlayTests {
nodeInfo := node.NodeInfo{}
nodeInfo.Id.Set(tt.nodeName)
nodeInfo := node.NewNode(tt.nodeName)
t.Run(tt.description, func(t *testing.T) {
provisionDir, provisionDirErr := os.MkdirTemp(os.TempDir(), "ww-test-provision-*")
assert.NoError(t, provisionDirErr)
@@ -266,15 +265,14 @@ func Test_BuildAllOverlays(t *testing.T) {
defer os.RemoveAll(provisionDir)
conf.Paths.WWProvisiondir = provisionDir
var nodes []node.NodeInfo
var nodes []node.NodeConf
for i, nodeName := range tt.nodes {
nodeInfo := node.NodeInfo{}
nodeInfo.Id.Set(nodeName)
nodeInfo := node.NewNode(nodeName)
if tt.systemOverlays != nil {
nodeInfo.SystemOverlay.SetSlice(tt.systemOverlays[i])
nodeInfo.SystemOverlay = tt.systemOverlays[i]
}
if tt.runtimeOverlays != nil {
nodeInfo.RuntimeOverlay.SetSlice(tt.runtimeOverlays[i])
nodeInfo.RuntimeOverlay = tt.runtimeOverlays[i]
}
nodes = append(nodes, nodeInfo)
}
@@ -365,10 +363,9 @@ func Test_BuildSpecificOverlays(t *testing.T) {
defer os.RemoveAll(provisionDir)
conf.Paths.WWProvisiondir = provisionDir
var nodes []node.NodeInfo
var nodes []node.NodeConf
for _, nodeName := range tt.nodes {
nodeInfo := node.NodeInfo{}
nodeInfo.Id.Set(nodeName)
nodeInfo := node.NewNode(nodeName)
nodes = append(nodes, nodeInfo)
}
err := BuildSpecificOverlays(nodes, tt.overlays)