diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index e31d300a2ee..3edc11e1a1c 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -1,4 +1,3 @@ -pkg/kubelet/cm/cpuset pkg/util/flag test/e2e/apimachinery vendor/k8s.io/apimachinery/pkg/util/json diff --git a/pkg/kubelet/cm/cpuset/cpuset.go b/pkg/kubelet/cm/cpuset/cpuset.go index b2ce7f9215b..ffae3c58b72 100644 --- a/pkg/kubelet/cm/cpuset/cpuset.go +++ b/pkg/kubelet/cm/cpuset/cpuset.go @@ -36,8 +36,8 @@ type Builder struct { } // NewBuilder returns a mutable CPUSet builder. -func NewBuilder() Builder { - return Builder{ +func NewBuilder() *Builder { + return &Builder{ result: CPUSet{ elems: map[int]struct{}{}, }, @@ -46,7 +46,7 @@ func NewBuilder() Builder { // Add adds the supplied elements to the result. Calling Add after calling // Result has no effect. -func (b Builder) Add(elems ...int) { +func (b *Builder) Add(elems ...int) { if b.done { return } @@ -57,7 +57,7 @@ func (b Builder) Add(elems ...int) { // Result returns the result CPUSet containing all elements that were // previously added to this builder. Subsequent calls to Add have no effect. -func (b Builder) Result() CPUSet { +func (b *Builder) Result() CPUSet { b.done = true return b.result } diff --git a/pkg/kubelet/cm/cpuset/cpuset_test.go b/pkg/kubelet/cm/cpuset/cpuset_test.go index d79748df506..09f01a843de 100644 --- a/pkg/kubelet/cm/cpuset/cpuset_test.go +++ b/pkg/kubelet/cm/cpuset/cpuset_test.go @@ -19,6 +19,8 @@ package cpuset import ( "reflect" "testing" + + "github.com/stretchr/testify/require" ) func TestCPUSetBuilder(t *testing.T) { @@ -36,6 +38,9 @@ func TestCPUSetBuilder(t *testing.T) { if len(elems) != result.Size() { t.Fatalf("expected cpuset %s to have the same size as %v", result, elems) } + + b.Add(6) + require.False(t, result.Contains(6), "expected calls to Add after calling Result() to have no effect") } func TestCPUSetSize(t *testing.T) {