github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #115359 from iancoolidge/devel-cpuset

Browse Source 
More code-review changes from k/utlils cpuset review
This commit is contained in:
Kubernetes Prow Robot 2023-02-28 10:55:16 -08:00 committed by GitHub
commit 18eea58ac2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/cm/cpuset/cpuset.go
View File

@ -230,7 +230,7 @@ func Parse(s string) (CPUSet, error) {
return New(), err return New(), err
} }
if start > end { if start > end {
return New(), fmt.Errorf("invalid range %q (%d >= %d)", r, start, end) return New(), fmt.Errorf("invalid range %q (%d > %d)", r, start, end)
} }
// start == end is acceptable (1-1 -> 1) // start == end is acceptable (1-1 -> 1)

62
pkg/kubelet/cm/cpuset/cpuset_test.go
View File

@ -18,6 +18,7 @@ package cpuset
import ( import (
"reflect" "reflect"
"sort"
"testing" "testing"
) )
@ -34,7 +35,7 @@ func TestCPUSetSize(t *testing.T) {
for _, c := range testCases { for _, c := range testCases {
actual := c.cpuset.Size() actual := c.cpuset.Size()
if actual != c.expected { if actual != c.expected {
t.Fatalf("expected: %d, actual: %d, cpuset: [%v]", c.expected, actual, c.cpuset) t.Errorf("expected: %d, actual: %d, cpuset: [%v]", c.expected, actual, c.cpuset)
} }
} }
} }
@ -52,7 +53,7 @@ func TestCPUSetIsEmpty(t *testing.T) {
for _, c := range testCases { for _, c := range testCases {
actual := c.cpuset.IsEmpty() actual := c.cpuset.IsEmpty()
if actual != c.expected { if actual != c.expected {
t.Fatalf("expected: %t, IsEmpty() returned: %t, cpuset: [%v]", c.expected, actual, c.cpuset) t.Errorf("expected: %t, IsEmpty() returned: %t, cpuset: [%v]", c.expected, actual, c.cpuset)
} }
} }
} }
@ -71,12 +72,12 @@ func TestCPUSetContains(t *testing.T) {
for _, c := range testCases { for _, c := range testCases {
for _, elem := range c.mustContain { for _, elem := range c.mustContain {
if !c.cpuset.Contains(elem) { if !c.cpuset.Contains(elem) {
t.Fatalf("expected cpuset to contain element %d: [%v]", elem, c.cpuset) t.Errorf("expected cpuset to contain element %d: [%v]", elem, c.cpuset)
} }
} }
for _, elem := range c.mustNotContain { for _, elem := range c.mustNotContain {
if c.cpuset.Contains(elem) { if c.cpuset.Contains(elem) {
t.Fatalf("expected cpuset not to contain element %d: [%v]", elem, c.cpuset) t.Errorf("expected cpuset not to contain element %d: [%v]", elem, c.cpuset)
} }
} }
} }
@ -90,6 +91,7 @@ func TestCPUSetEqual(t *testing.T) {
{New(), New()}, {New(), New()},
{New(5), New(5)}, {New(5), New(5)},
{New(1, 2, 3, 4, 5), New(1, 2, 3, 4, 5)}, {New(1, 2, 3, 4, 5), New(1, 2, 3, 4, 5)},
{New(5, 4, 3, 2, 1), New(1, 2, 3, 4, 5)},
} }
shouldNotEqual := []struct { shouldNotEqual := []struct {
@ -106,12 +108,12 @@ func TestCPUSetEqual(t *testing.T) {
for _, c := range shouldEqual { for _, c := range shouldEqual {
if !c.s1.Equals(c.s2) { if !c.s1.Equals(c.s2) {
t.Fatalf("expected cpusets to be equal: s1: [%v], s2: [%v]", c.s1, c.s2) t.Errorf("expected cpusets to be equal: s1: [%v], s2: [%v]", c.s1, c.s2)
} }
} }
for _, c := range shouldNotEqual { for _, c := range shouldNotEqual {
if c.s1.Equals(c.s2) { if c.s1.Equals(c.s2) {
t.Fatalf("expected cpusets to not be equal: s1: [%v], s2: [%v]", c.s1, c.s2) t.Errorf("expected cpusets to not be equal: s1: [%v], s2: [%v]", c.s1, c.s2)
} }
} }
} }
@ -139,16 +141,22 @@ func TestCPUSetIsSubsetOf(t *testing.T) {
shouldNotBeSubset := []struct { shouldNotBeSubset := []struct {
s1 CPUSet s1 CPUSet
s2 CPUSet s2 CPUSet
}{} }{
// A set with more elements is not a subset.
{New(5), New()},
// Disjoint set is not a subset.
{New(6), New(5)},
}
for _, c := range shouldBeSubset { for _, c := range shouldBeSubset {
if !c.s1.IsSubsetOf(c.s2) { if !c.s1.IsSubsetOf(c.s2) {
t.Fatalf("expected s1 to be a subset of s2: s1: [%v], s2: [%v]", c.s1, c.s2) t.Errorf("expected s1 to be a subset of s2: s1: [%v], s2: [%v]", c.s1, c.s2)
} }
} }
for _, c := range shouldNotBeSubset { for _, c := range shouldNotBeSubset {
if c.s1.IsSubsetOf(c.s2) { if c.s1.IsSubsetOf(c.s2) {
t.Fatalf("expected s1 to not be a subset of s2: s1: [%v], s2: [%v]", c.s1, c.s2) t.Errorf("expected s1 to not be a subset of s2: s1: [%v], s2: [%v]", c.s1, c.s2)
} }
} }
} }
@ -185,7 +193,7 @@ func TestCPUSetUnion(t *testing.T) {
for _, c := range testCases { for _, c := range testCases {
result := c.s1.Union(c.others...) result := c.s1.Union(c.others...)
if !result.Equals(c.expected) { if !result.Equals(c.expected) {
t.Fatalf("expected the union of s1 and s2 to be [%v] (got [%v]), others: [%v]", c.expected, result, c.others) t.Errorf("expected the union of s1 and s2 to be [%v] (got [%v]), others: [%v]", c.expected, result, c.others)
} }
} }
} }
@ -216,7 +224,7 @@ func TestCPUSetIntersection(t *testing.T) {
for _, c := range testCases { for _, c := range testCases {
result := c.s1.Intersection(c.s2) result := c.s1.Intersection(c.s2)
if !result.Equals(c.expected) { if !result.Equals(c.expected) {
t.Fatalf("expected the intersection of s1 and s2 to be [%v] (got [%v]), s1: [%v], s2: [%v]", c.expected, result, c.s1, c.s2) t.Errorf("expected the intersection of s1 and s2 to be [%v] (got [%v]), s1: [%v], s2: [%v]", c.expected, result, c.s1, c.s2)
} }
} }
} }
@ -247,7 +255,7 @@ func TestCPUSetDifference(t *testing.T) {
for _, c := range testCases { for _, c := range testCases {
result := c.s1.Difference(c.s2) result := c.s1.Difference(c.s2)
if !result.Equals(c.expected) { if !result.Equals(c.expected) {
t.Fatalf("expected the difference of s1 and s2 to be [%v] (got [%v]), s1: [%v], s2: [%v]", c.expected, result, c.s1, c.s2) t.Errorf("expected the difference of s1 and s2 to be [%v] (got [%v]), s1: [%v], s2: [%v]", c.expected, result, c.s1, c.s2)
} }
} }
} }
@ -255,17 +263,26 @@ func TestCPUSetDifference(t *testing.T) {
func TestCPUSetList(t *testing.T) { func TestCPUSetList(t *testing.T) {
testCases := []struct { testCases := []struct {
set CPUSet set CPUSet
expected []int expected []int // must be sorted
}{ }{
{New(), []int{}}, {New(), []int{}},
{New(5), []int{5}}, {New(5), []int{5}},
{New(1, 2, 3, 4, 5), []int{1, 2, 3, 4, 5}}, {New(1, 2, 3, 4, 5), []int{1, 2, 3, 4, 5}},
{New(5, 4, 3, 2, 1), []int{1, 2, 3, 4, 5}},
} }
for _, c := range testCases { for _, c := range testCases {
result := c.set.List() result := c.set.List()
if !reflect.DeepEqual(result, c.expected) { if !reflect.DeepEqual(result, c.expected) {
t.Fatalf("expected set as slice to be [%v] (got [%v]), s: [%v]", c.expected, result, c.set) t.Errorf("unexpected List() contents. got [%v] want [%v] (set: [%v])", result, c.expected, c.set)
}
// We cannot rely on internal storage order details for a unit test.
// The best we can do is to sort the output of 'UnsortedList'.
result = c.set.UnsortedList()
sort.Ints(result)
if !reflect.DeepEqual(result, c.expected) {
t.Errorf("unexpected UnsortedList() contents. got [%v] want [%v] (set: [%v])", result, c.expected, c.set)
} }
} }
} }
@ -284,7 +301,7 @@ func TestCPUSetString(t *testing.T) {
for _, c := range testCases { for _, c := range testCases {
result := c.set.String() result := c.set.String()
if result != c.expected { if result != c.expected {
t.Fatalf("expected set as string to be %s (got \"%s\"), s: [%v]", c.expected, result, c.set) t.Errorf("expected set as string to be %s (got \"%s\"), s: [%v]", c.expected, result, c.set)
} }
} }
} }
@ -307,10 +324,10 @@ func TestParse(t *testing.T) {
for _, c := range positiveTestCases { for _, c := range positiveTestCases {
result, err := Parse(c.cpusetString) result, err := Parse(c.cpusetString)
if err != nil { if err != nil {
t.Fatalf("expected error not to have occurred: %v", err) t.Errorf("expected error not to have occurred: %v", err)
} }
if !result.Equals(c.expected) { if !result.Equals(c.expected) {
t.Fatalf("expected string \"%s\" to parse as [%v] (got [%v])", c.cpusetString, c.expected, result) t.Errorf("expected string \"%s\" to parse as [%v] (got [%v])", c.cpusetString, c.expected, result)
} }
} }
@ -326,7 +343,16 @@ func TestParse(t *testing.T) {
for _, c := range negativeTestCases { for _, c := range negativeTestCases {
result, err := Parse(c) result, err := Parse(c)
if err == nil { if err == nil {
t.Fatalf("expected parse failure of \"%s\", but it succeeded as \"%s\"", c, result.String()) t.Errorf("expected parse failure of \"%s\", but it succeeded as \"%s\"", c, result.String())
} }
} }
} }
func TestClone(t *testing.T) {
original := New(1, 2, 3, 4, 5)
clone := original.Clone()
if !original.Equals(clone) {
t.Errorf("expected clone [%v] to equal original [%v]", clone, original)
}
}