Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-28 14:41:10 +01:00
Code Packages Releases Activity

descheduler_test.go: initDescheduler: pass a new ctx with cancel instead of returning a cancel

Browse Source
This commit is contained in:
Jan Chaloupka
2024-07-09 09:19:59 +02:00
parent d0695abea9
commit ea2eeccff4
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/descheduler/descheduler_test.go
View File

@@ -98,7 +98,7 @@ func removeDuplicatesPolicy() *api.DeschedulerPolicy {
} }
} }
func initDescheduler(t *testing.T, ctx context.Context, internalDeschedulerPolicy *api.DeschedulerPolicy, objects ...runtime.Object) (*options.DeschedulerServer, *descheduler, *fakeclientset.Clientset, func()) { func initDescheduler(t *testing.T, ctx context.Context, internalDeschedulerPolicy *api.DeschedulerPolicy, objects ...runtime.Object) (*options.DeschedulerServer, *descheduler, *fakeclientset.Clientset) {
client := fakeclientset.NewSimpleClientset(objects...) client := fakeclientset.NewSimpleClientset(objects...)
eventClient := fakeclientset.NewSimpleClientset(objects...) eventClient := fakeclientset.NewSimpleClientset(objects...)
@@ -118,15 +118,10 @@ func initDescheduler(t *testing.T, ctx context.Context, internalDeschedulerPolic
t.Fatalf("Unable to create a descheduler instance: %v", err) t.Fatalf("Unable to create a descheduler instance: %v", err)
} }
ctx, cancel := context.WithCancel(ctx)
sharedInformerFactory.Start(ctx.Done()) sharedInformerFactory.Start(ctx.Done())
sharedInformerFactory.WaitForCacheSync(ctx.Done()) sharedInformerFactory.WaitForCacheSync(ctx.Done())
return rs, descheduler, client, func() { return rs, descheduler, client
cancel()
eventBroadcaster.Shutdown()
}
} }
func TestTaintsUpdated(t *testing.T) { func TestTaintsUpdated(t *testing.T) {
@@ -400,7 +395,8 @@ func TestPodEvictorReset(t *testing.T) {
p3.ObjectMeta.OwnerReferences = ownerRef1 p3.ObjectMeta.OwnerReferences = ownerRef1
p4.ObjectMeta.OwnerReferences = ownerRef1 p4.ObjectMeta.OwnerReferences = ownerRef1
rs, descheduler, client, cancel := initDescheduler(t, ctx, removeDuplicatesPolicy(), node1, node2, p1, p2, p3, p4) ctxCancel, cancel := context.WithCancel(ctx)
rs, descheduler, client := initDescheduler(t, ctxCancel, removeDuplicatesPolicy(), node1, node2, p1, p2, p3, p4)
defer cancel() defer cancel()
var evictedPods []string var evictedPods []string