github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Revert changes in tests

Browse Source
This commit is contained in:
Krzysztof Dąbrowski 2024-03-30 20:46:23 +01:00
parent 5e94ffe90b
commit 170d143b1a
No known key found for this signature in database
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/nodeipam/ipam/cidr_allocator.go
View File

@ -75,11 +75,11 @@ const (
// updateMaxRetries is the max retries for a failed node // updateMaxRetries is the max retries for a failed node
updateMaxRetries = 10 updateMaxRetries = 10
// nodePollInterval is used in listing node
nodePollInterval = 10 * time.Second
) )
// nodePollInterval is used in listing node
var nodePollInterval = 10 * time.Second
// CIDRAllocator is an interface implemented by things that know how // CIDRAllocator is an interface implemented by things that know how
// to allocate/occupy/recycle CIDR for nodes. // to allocate/occupy/recycle CIDR for nodes.
type CIDRAllocator interface { type CIDRAllocator interface {

14
pkg/controller/nodeipam/ipam/range_allocator_test.go
View File

@ -292,6 +292,13 @@ func TestOccupyPreExistingCIDR(t *testing.T) {
} }
func TestAllocateOrOccupyCIDRSuccess(t *testing.T) { func TestAllocateOrOccupyCIDRSuccess(t *testing.T) {
// Non-parallel test (overrides global var)
oldNodePollInterval := nodePollInterval
nodePollInterval = test.NodePollInterval
defer func() {
nodePollInterval = oldNodePollInterval
}()
// all tests operate on a single node // all tests operate on a single node
testCases := []testCase{ testCases := []testCase{
{ {
@ -673,6 +680,13 @@ type releaseTestCase struct {
} }
func TestReleaseCIDRSuccess(t *testing.T) { func TestReleaseCIDRSuccess(t *testing.T) {
// Non-parallel test (overrides global var)
oldNodePollInterval := nodePollInterval
nodePollInterval = test.NodePollInterval
defer func() {
nodePollInterval = oldNodePollInterval
}()
testCases := []releaseTestCase{ testCases := []releaseTestCase{
{ {
description: "Correctly release preallocated CIDR", description: "Correctly release preallocated CIDR",