github/node-problem-detector
1
0
Fork 0
mirror of https://github.com/kubernetes/node-problem-detector.git synced 2026-08-20 04:36:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lint findings in the new tests

Browse Source 
Return a snapshot struct from the test execution recorder.
Move the apply-configuration test table into a helper function.
This commit is contained in:
Veer Singh
2026-07-20 23:58:14 -07:00
parent 798cc3bd1d
commit bc34f45c3a
2 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/custompluginmonitor/plugin/plugin_scheduler_test.go
+20 -9
View File
@@ -130,7 +130,14 @@ func (r *executionRecorder) run(rule cpmtypes.CustomRule) (cpmtypes.Status, stri
return cpmtypes.OK, rule.Path
}
func (r *executionRecorder) snapshot() (map[string]int, map[string]int, int, int) {
type executionSnapshot struct {
counts map[string]int
maxActive map[string]int
activeTotal int
highWater int
}
func (r *executionRecorder) snapshot() executionSnapshot {
r.mu.Lock()
defer r.mu.Unlock()
counts := make(map[string]int, len(r.counts))
@@ -141,7 +148,12 @@ func (r *executionRecorder) snapshot() (map[string]int, map[string]int, int, int
for rule, count := range r.maxActive {
maxActive[rule] = count
}
return counts, maxActive, r.activeTotal, r.highWater
return executionSnapshot{
counts: counts,
maxActive: maxActive,
activeTotal: r.activeTotal,
highWater: r.highWater,
}
}
func schedulerRule(name string, interval *time.Duration) *cpmtypes.CustomRule {
@@ -247,7 +259,7 @@ func stepClock(t *testing.T, fakeClock *recordingClock, duration time.Duration)
func assertCounts(t *testing.T, recorder *executionRecorder, wanted map[string]int) {
t.Helper()
got, _, _, _ := recorder.snapshot()
got := recorder.snapshot().counts
if !reflect.DeepEqual(got, wanted) {
t.Fatalf("Invocation counts differ: got %v, wanted %v", got, wanted)
}
@@ -432,15 +444,14 @@ func TestPluginSchedulerConcurrencyReachesLimit(t *testing.T) {
}
stepClock(t, fakeClock, 10*time.Second)
waitInvocations(t, recorder, 2)
_, _, active, highWater := recorder.snapshot()
if active != 2 || highWater != 2 {
t.Fatalf("Concurrency state is active=%d high-water=%d; wanted 2 and 2", active, highWater)
snapshot := recorder.snapshot()
if snapshot.activeTotal != 2 || snapshot.highWater != 2 {
t.Fatalf("Concurrency state is active=%d high-water=%d; wanted 2 and 2", snapshot.activeTotal, snapshot.highWater)
}
close(release)
waitInvocations(t, recorder, 2)
waitResults(t, p, 4)
_, _, _, highWater = recorder.snapshot()
if highWater != 2 {
if highWater := recorder.snapshot().highWater; highWater != 2 {
t.Fatalf("Concurrency high-water is %d; wanted 2", highWater)
}
stopPlugin(t, p)
@@ -468,7 +479,7 @@ func TestPluginSchedulerRuleNeverOverlapsAndOverrunCatchesUpOnce(t *testing.T) {
waitInvocations(t, recorder, 1)
waitResults(t, p, 1)
assertCounts(t, recorder, map[string]int{"rule": 3})
_, maxActive, _, _ := recorder.snapshot()
maxActive := recorder.snapshot().maxActive
if maxActive["rule"] != 1 {
t.Fatalf("Rule concurrency high-water is %d; wanted 1", maxActive["rule"])
}