Skip to content

Commit 642029c

Browse files
authored
Merge pull request #2184 from sthaha/ci-fix-tests
chore: fix failing monitor tests
2 parents 3bf901c + 652a3ef commit 642029c

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

internal/monitor/container_power_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ func TestContainerPowerCalculation(t *testing.T) {
198198
Running: map[string]*resource.Container{},
199199
Terminated: map[string]*resource.Container{},
200200
}
201+
tr := CreateTestResources(createOnly(testNode))
202+
resInformer.On("Node").Return(tr.Node, nil).Maybe()
201203
resInformer.On("Containers").Return(emptyContaineres).Once()
202204

203205
err := monitor.calculateContainerPower(prevSnapshot, newSnapshot)

internal/monitor/vm_test.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ func TestVMPowerCalculation(t *testing.T) {
4040

4141
t.Run("firstVMRead", func(t *testing.T) {
4242
testData := CreateTestVMs()
43-
resourceInformer.On("Node").Return(testData.Node, nil).Once()
44-
resourceInformer.On("Node").Return(testData.Node, nil).Once() // Additional call for firstVMRead
43+
resourceInformer.On("Node").Return(testData.Node, nil).Maybe()
44+
resourceInformer.On("Node").Return(testData.Node, nil).Maybe() // Additional call for firstVMRead
4545
resourceInformer.On("VirtualMachines").Return(testData.VMs).Once()
4646

4747
snapshot := NewSnapshot()
@@ -102,7 +102,7 @@ func TestVMPowerCalculation(t *testing.T) {
102102

103103
// Setup mock to return updated VMs
104104
testData := CreateTestVMs()
105-
resourceInformer.On("Node").Return(testData.Node, nil).Once()
105+
resourceInformer.On("Node").Return(testData.Node, nil).Maybe()
106106
resourceInformer.On("VirtualMachines").Return(testData.VMs).Once()
107107

108108
err = monitor.calculateVMPower(prevSnapshot, newSnapshot)
@@ -173,7 +173,7 @@ func TestVMPowerCalculation(t *testing.T) {
173173
}
174174

175175
testData := CreateTestVMs()
176-
resourceInformer.On("Node").Return(testData.Node, nil).Once()
176+
resourceInformer.On("Node").Return(testData.Node, nil).Maybe()
177177
resourceInformer.On("VirtualMachines").Return(testData.VMs).Once()
178178

179179
err := monitor.calculateVMPower(prevSnapshot, newSnapshot)
@@ -201,6 +201,8 @@ func TestVMPowerCalculation(t *testing.T) {
201201
Running: map[string]*resource.VirtualMachine{},
202202
Terminated: map[string]*resource.VirtualMachine{},
203203
}
204+
tr := CreateTestResources(createOnly(testNode))
205+
resourceInformer.On("Node").Return(tr.Node, nil).Maybe()
204206
resourceInformer.On("VirtualMachines").Return(emptyVMs).Once()
205207

206208
err := monitor.calculateVMPower(prevSnapshot, newSnapshot)
@@ -231,7 +233,7 @@ func TestVMPowerCalculation(t *testing.T) {
231233
}
232234

233235
tr := CreateTestResources()
234-
resourceInformer.On("Node").Return(tr.Node, nil).Once()
236+
resourceInformer.On("Node").Return(tr.Node, nil).Maybe()
235237
resourceInformer.On("VirtualMachines").Return(vms).Once()
236238

237239
err := monitor.calculateVMPower(prevSnapshot, newSnapshot)
@@ -286,7 +288,7 @@ func TestVMPowerCalculation(t *testing.T) {
286288
}
287289

288290
tr := CreateTestResources(createOnly(testNode))
289-
resourceInformer.On("Node").Return(tr.Node, nil).Once()
291+
resourceInformer.On("Node").Return(tr.Node, nil).Maybe()
290292
resourceInformer.On("VirtualMachines").Return(testVMs).Once()
291293

292294
err := monitor.calculateVMPower(prevSnapshot, newSnapshot)
@@ -394,7 +396,7 @@ func TestVMPowerCalculation(t *testing.T) {
394396
}
395397

396398
tr := CreateTestResources()
397-
resourceInformer.On("Node").Return(tr.Node, nil).Once()
399+
resourceInformer.On("Node").Return(tr.Node, nil).Maybe()
398400
resourceInformer.On("VirtualMachines").Return(vmsWithTerminated).Once()
399401

400402
err := monitor.calculateVMPower(prevSnapshot, newSnapshot)
@@ -467,7 +469,7 @@ func TestVMPowerConsistency(t *testing.T) {
467469
}
468470

469471
tr := CreateTestResources()
470-
mockResourceInformer.On("Node").Return(tr.Node, nil).Once()
472+
mockResourceInformer.On("Node").Return(tr.Node, nil).Maybe()
471473
mockResourceInformer.On("VirtualMachines").Return(testVMs).Once()
472474

473475
err := monitor.calculateVMPower(prevSnapshot, newSnapshot)
@@ -508,7 +510,7 @@ func TestVMPowerConsistency(t *testing.T) {
508510
}
509511

510512
tr := CreateTestResources()
511-
mockResourceInformer.On("Node").Return(tr.Node, nil).Once()
513+
mockResourceInformer.On("Node").Return(tr.Node, nil).Maybe()
512514
mockResourceInformer.On("VirtualMachines").Return(testVMs).Once()
513515

514516
err := monitor.calculateVMPower(prevSnapshot, newSnapshot)

0 commit comments

Comments
 (0)