Merge pull request kubernetes#88685 from fengzixu/move-util-functions

Refactor: move generic functions of integration test to util directory

Author: k8s-ci-robot

test/integration/scheduler/BUILD

@@ -61,6 +61,7 @@ go_test(
         "//staging/src/k8s.io/kube-scheduler/extender/v1:go_default_library",
         "//test/e2e/framework/pod:go_default_library",
         "//test/integration/framework:go_default_library",
+        "//test/integration/util:go_default_library",
         "//test/utils:go_default_library",
         "//test/utils/image:go_default_library",
         "//vendor/github.com/google/go-cmp/cmp:go_default_library",
@@ -89,34 +90,22 @@ go_library(
         "//pkg/api/v1/pod:go_default_library",
         "//pkg/controller/disruption:go_default_library",
         "//pkg/scheduler:go_default_library",
-        "//pkg/scheduler/apis/config:go_default_library",
-        "//pkg/scheduler/apis/config/scheme:go_default_library",
-        "//pkg/scheduler/apis/config/v1:go_default_library",
-        "//pkg/scheduler/profile:go_default_library",
-        "//pkg/util/taints:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/api/policy/v1beta1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
         "//staging/src/k8s.io/client-go/discovery/cached/memory:go_default_library",
         "//staging/src/k8s.io/client-go/dynamic:go_default_library",
         "//staging/src/k8s.io/client-go/informers:go_default_library",
-        "//staging/src/k8s.io/client-go/informers/core/v1:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
         "//staging/src/k8s.io/client-go/listers/core/v1:go_default_library",
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/restmapper:go_default_library",
         "//staging/src/k8s.io/client-go/scale:go_default_library",
-        "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
-        "//staging/src/k8s.io/client-go/tools/events:go_default_library",
-        "//test/integration/framework:go_default_library",
+        "//test/integration/util:go_default_library",
         "//test/utils/image:go_default_library",
     ],
 )

test/integration/scheduler/extender_test.go

@@ -35,6 +35,7 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	extenderv1 "k8s.io/kube-scheduler/extender/v1"
 	schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config"
+	testutils "k8s.io/kubernetes/test/integration/util"
 	imageutils "k8s.io/kubernetes/test/utils/image"
 )
 
@@ -279,8 +280,8 @@ func machine3Prioritizer(pod *v1.Pod, nodes *v1.NodeList) (*extenderv1.HostPrior
 }
 
 func TestSchedulerExtender(t *testing.T) {
-	testCtx := initTestMaster(t, "scheduler-extender", nil)
-	clientSet := testCtx.clientSet
+	testCtx := testutils.InitTestMaster(t, "scheduler-extender", nil)
+	clientSet := testCtx.ClientSet
 
 	extender1 := &Extender{
 		name:         "extender1",
@@ -349,10 +350,10 @@ func TestSchedulerExtender(t *testing.T) {
 	}
 	policy.APIVersion = "v1"
 
-	testCtx = initTestScheduler(t, testCtx, false, &policy)
-	defer cleanupTest(t, testCtx)
+	testCtx = testutils.InitTestScheduler(t, testCtx, false, &policy)
+	defer testutils.CleanupTest(t, testCtx)
 
-	DoTestPodScheduling(testCtx.ns, t, clientSet)
+	DoTestPodScheduling(testCtx.NS, t, clientSet)
 }
 
 func DoTestPodScheduling(ns *v1.Namespace, t *testing.T, cs clientset.Interface) {
@@ -405,7 +406,7 @@ func DoTestPodScheduling(ns *v1.Namespace, t *testing.T, cs clientset.Interface)
 		t.Fatalf("Failed to create pod: %v", err)
 	}
 
-	err = wait.Poll(time.Second, wait.ForeverTestTimeout, podScheduled(cs, myPod.Namespace, myPod.Name))
+	err = wait.Poll(time.Second, wait.ForeverTestTimeout, testutils.PodScheduled(cs, myPod.Namespace, myPod.Name))
 	if err != nil {
 		t.Fatalf("Failed to schedule pod: %v", err)
 	}