github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

add nil check to avoid passing fakeCh for all discovery tests

Browse Source
This commit is contained in:
Jefftree 2024-02-21 12:54:58 -05:00
parent 6726e65619
commit 81e4c3002a
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_discovery.go
View File

@ -443,7 +443,9 @@ func (dm *discoveryManager) Run(stopCh <-chan struct{}, discoverySyncedCh chan<-
} }
wg.Wait() wg.Wait()
close(discoverySyncedCh) if discoverySyncedCh != nil {
close(discoverySyncedCh)
}
// Spawn workers // Spawn workers
// These workers wait for APIServices to be marked dirty. // These workers wait for APIServices to be marked dirty.

22
staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_discovery_test.go
View File

@ -61,10 +61,6 @@ func waitForQueueComplete(stopCh <-chan struct{}, dm *discoveryManager) bool {
}) })
} }
func fakeCh() chan struct{} {
return make(chan struct{})
}
// Test that the discovery manager starts and aggregates from two local API services // Test that the discovery manager starts and aggregates from two local API services
func TestBasic(t *testing.T) { func TestBasic(t *testing.T) {
service1 := discoveryendpoint.NewResourceManager("apis") service1 := discoveryendpoint.NewResourceManager("apis")
@ -208,7 +204,7 @@ func TestBasic(t *testing.T) {
testCtx, testCancel := context.WithCancel(context.Background()) testCtx, testCancel := context.WithCancel(context.Background())
defer testCancel() defer testCancel()
go aggregatedManager.Run(testCtx.Done(), fakeCh()) go aggregatedManager.Run(testCtx.Done(), nil)
require.True(t, waitForQueueComplete(testCtx.Done(), aggregatedManager)) require.True(t, waitForQueueComplete(testCtx.Done(), aggregatedManager))
@ -272,7 +268,7 @@ func TestInitialRunHasAllAPIServices(t *testing.T) {
testCtx, cancel := context.WithCancel(context.Background()) testCtx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
initialSyncedCh := fakeCh() initialSyncedCh := make(chan struct{})
go aggregatedManager.Run(testCtx.Done(), initialSyncedCh) go aggregatedManager.Run(testCtx.Done(), initialSyncedCh)
select { select {
case <-initialSyncedCh: case <-initialSyncedCh:
@ -327,7 +323,7 @@ func TestDirty(t *testing.T) {
testCtx, cancel := context.WithCancel(context.Background()) testCtx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
go aggregatedManager.Run(testCtx.Done(), fakeCh()) go aggregatedManager.Run(testCtx.Done(), nil)
require.True(t, waitForQueueComplete(testCtx.Done(), aggregatedManager)) require.True(t, waitForQueueComplete(testCtx.Done(), aggregatedManager))
// immediately check for ping, since Run() should block for local services // immediately check for ping, since Run() should block for local services
@ -364,7 +360,7 @@ func TestWaitForSync(t *testing.T) {
testCtx, cancel := context.WithCancel(context.Background()) testCtx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
go aggregatedManager.Run(testCtx.Done(), fakeCh()) go aggregatedManager.Run(testCtx.Done(), nil)
require.True(t, waitForQueueComplete(testCtx.Done(), aggregatedManager)) require.True(t, waitForQueueComplete(testCtx.Done(), aggregatedManager))
// immediately check for ping, since Run() should block for local services // immediately check for ping, since Run() should block for local services
@ -411,7 +407,7 @@ func TestRemoveAPIService(t *testing.T) {
testCtx, testCancel := context.WithCancel(context.Background()) testCtx, testCancel := context.WithCancel(context.Background())
defer testCancel() defer testCancel()
go aggregatedManager.Run(testCtx.Done(), fakeCh()) go aggregatedManager.Run(testCtx.Done(), nil)
for _, s := range apiServices { for _, s := range apiServices {
aggregatedManager.RemoveAPIService(s.Name) aggregatedManager.RemoveAPIService(s.Name)
@ -587,7 +583,7 @@ func TestLegacyFallbackNoCache(t *testing.T) {
testCtx, cancel := context.WithCancel(context.Background()) testCtx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
go aggregatedManager.Run(testCtx.Done(), fakeCh()) go aggregatedManager.Run(testCtx.Done(), nil)
require.True(t, waitForQueueComplete(testCtx.Done(), aggregatedManager)) require.True(t, waitForQueueComplete(testCtx.Done(), aggregatedManager))
// At this point external services have synced. Check if discovery document // At this point external services have synced. Check if discovery document
@ -725,7 +721,7 @@ func testLegacyFallbackWithCustomRootHandler(t *testing.T, rootHandlerFn func(ht
testCtx, cancel := context.WithCancel(context.Background()) testCtx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
go aggregatedManager.Run(testCtx.Done(), fakeCh()) go aggregatedManager.Run(testCtx.Done(), nil)
require.True(t, waitForQueueComplete(testCtx.Done(), aggregatedManager)) require.True(t, waitForQueueComplete(testCtx.Done(), aggregatedManager))
// At this point external services have synced. Check if discovery document // At this point external services have synced. Check if discovery document
@ -805,7 +801,7 @@ func TestAPIServiceStale(t *testing.T) {
testCtx, cancel := context.WithCancel(context.Background()) testCtx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
go aggregatedManager.Run(testCtx.Done(), fakeCh()) go aggregatedManager.Run(testCtx.Done(), nil)
require.True(t, waitForQueueComplete(testCtx.Done(), aggregatedManager)) require.True(t, waitForQueueComplete(testCtx.Done(), aggregatedManager))
// At this point external services have synced. Check if discovery document // At this point external services have synced. Check if discovery document
@ -867,7 +863,7 @@ func TestNotModified(t *testing.T) {
testCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second) testCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel() defer cancel()
go aggregatedManager.Run(testCtx.Done(), fakeCh()) go aggregatedManager.Run(testCtx.Done(), nil)
// Important to wait here to ensure we prime the cache with the initial list // Important to wait here to ensure we prime the cache with the initial list
// of documents in order to exercise 304 Not Modified // of documents in order to exercise 304 Not Modified