From 6f2781b9fedfc3f427974c01af4941fa8f177834 Mon Sep 17 00:00:00 2001 From: Antti Kervinen Date: Mon, 27 Nov 2023 10:13:29 +0200 Subject: [PATCH] balloons: fix unit tests CPUTopologyLevel is now a cfgapi type, there is no more custom parser to be tested. Signed-off-by: Antti Kervinen --- cmd/plugins/balloons/policy/cputree_test.go | 45 +-------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/cmd/plugins/balloons/policy/cputree_test.go b/cmd/plugins/balloons/policy/cputree_test.go index b1021a2f2..cad1847a3 100644 --- a/cmd/plugins/balloons/policy/cputree_test.go +++ b/cmd/plugins/balloons/policy/cputree_test.go @@ -584,7 +584,7 @@ func TestWalk(t *testing.T) { foundLevel := CPUTopologyLevelUndefined rv := tree.DepthFirstWalk(func(tn *cpuTreeNode) error { foundName = tn.name - foundLevel = tn.level + foundLevel = string(tn.level) return nil }) if rv != nil { @@ -669,49 +669,6 @@ func TestCpuLocations(t *testing.T) { } } -func TestCPUTopologyLevel(t *testing.T) { - var lvl CPUTopologyLevel - if lvl != CPUTopologyLevelUndefined { - t.Errorf("unexpected default inital value for lvl: %s, expected undefined", lvl) - } - if err := lvl.UnmarshalJSON([]byte("\"\"")); err != nil || lvl != CPUTopologyLevelUndefined { - t.Errorf("unexpected outcome unmarshalling topology level: \"\", error: %s, result: %s", err, lvl) - } - if err := lvl.UnmarshalJSON([]byte("\"system\"")); err != nil || lvl != CPUTopologyLevelSystem { - t.Errorf("unexpected outcome unmarshalling topology level: system, error: %s, result: %s", err, lvl) - } - if err := lvl.UnmarshalJSON([]byte("\"NUMA\"")); err != nil || lvl != CPUTopologyLevelNuma { - t.Errorf("unexpected outcome unmarshalling topology level: \"NUMA\", error: %s, result: %s", err, lvl) - } - if err := lvl.UnmarshalJSON([]byte("\"undefined\"")); err == nil { - t.Errorf("unexpected outcome unmarshalling topology level: \"undefined\", error: %s, result: %s", err, lvl) - } - if err := lvl.UnmarshalJSON([]byte("system")); err == nil { - t.Errorf("unexpected non-error outcome unmarshalling topology level: system, error: %s, result: %s", err, lvl) - } - if err := lvl.UnmarshalJSON([]byte("0")); err == nil { - t.Errorf("unexpected non-error outcome unmarshalling topology level: 0, error: %s, result: %s", err, lvl) - } - if err := lvl.UnmarshalJSON([]byte("\"4\"")); err == nil { - t.Errorf("unexpected non-error outcome unmarshalling topology level: \"0\", error: %s, result: %s", err, lvl) - } - if undefBytes, err := CPUTopologyLevelUndefined.MarshalJSON(); err != nil { - t.Errorf("unexpected error marshaling undefined: %s", err) - } else { - if err = lvl.UnmarshalJSON(undefBytes); err != nil || lvl != CPUTopologyLevelUndefined { - t.Errorf("unexpected outcome unmarshaling marshaled undefined: error: %s, result: %s", err, lvl) - } - } - if threadBytes, err := CPUTopologyLevelThread.MarshalJSON(); err != nil { - t.Errorf("unexpected error marshaling thread: %s", err) - } else { - if err = lvl.UnmarshalJSON(threadBytes); err != nil || lvl != CPUTopologyLevelThread { - t.Errorf("unexpected outcome unmarshaling marshaled thread: error: %s, result: %s", err, lvl) - } - } - -} - func TestSplitLevel(t *testing.T) { root, _ := newCpuTreeFromInt5([5]int{2, 2, 2, 4, 2}) newRoot := root.SplitLevel(CPUTopologyLevelNuma,