mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Clean shutdown of apply integration tests
This commit is contained in:
parent
c519bc02e8
commit
71d87272de
@ -435,6 +435,7 @@ func TestApplyCRDUnhandledSchema(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer etcdclient.Close()
|
||||
|
||||
server, err := apiservertesting.StartTestServer(t, apiservertesting.NewDefaultTestServerOptions(), nil, storageConfig)
|
||||
if err != nil {
|
||||
|
@ -119,8 +119,15 @@ func TestNamespaceCondition(t *testing.T) {
|
||||
|
||||
// TestNamespaceLabels tests for default labels added in https://github.com/kubernetes/kubernetes/pull/96968
|
||||
func TestNamespaceLabels(t *testing.T) {
|
||||
closeFn, _, _, kubeClient, _ := namespaceLifecycleSetup(t)
|
||||
closeFn, nsController, _, kubeClient, _ := namespaceLifecycleSetup(t)
|
||||
defer closeFn()
|
||||
|
||||
// Even though nscontroller isn't used in this test, its creation is already
|
||||
// spawning some goroutines. So we need to run it to ensure they won't leak.
|
||||
stopCh := make(chan struct{})
|
||||
close(stopCh)
|
||||
go nsController.Run(5, stopCh)
|
||||
|
||||
nsName := "test-namespace-labels-generated"
|
||||
// Create a new namespace w/ no name
|
||||
ns, err := kubeClient.CoreV1().Namespaces().Create(context.TODO(), &corev1.Namespace{
|
||||
|
@ -63,6 +63,7 @@ func TestCoreResourceEnqueue(t *testing.T) {
|
||||
testutils.SyncInformerFactory(testCtx)
|
||||
|
||||
defer testutils.CleanupTest(t, testCtx)
|
||||
defer testCtx.Scheduler.SchedulingQueue.Close()
|
||||
|
||||
cs, ns, ctx := testCtx.ClientSet, testCtx.NS.Name, testCtx.Ctx
|
||||
// Create one Node with a taint.
|
||||
|
@ -899,7 +899,7 @@ func timeout(ctx context.Context, d time.Duration, f func()) error {
|
||||
done := make(chan struct{})
|
||||
go func() {
|
||||
f()
|
||||
done <- struct{}{}
|
||||
close(done)
|
||||
}()
|
||||
|
||||
select {
|
||||
|
Loading…
Reference in New Issue
Block a user