Scheduler:remove direct dependency for pkg/api/testing

This commit is contained in:
tanjunchen
2020-04-11 13:16:06 +08:00
parent 3c871adc5f
commit 5ab543500b
4 changed files with 9 additions and 51 deletions

View File

@@ -20,8 +20,6 @@ import (
"context"
"encoding/json"
"errors"
apierrors "k8s.io/apimachinery/pkg/api/errors"
apicore "k8s.io/kubernetes/pkg/apis/core"
"reflect"
"strings"
"testing"
@@ -29,6 +27,7 @@ import (
"github.com/google/go-cmp/cmp"
v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/clock"
@@ -40,7 +39,7 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/events"
extenderv1 "k8s.io/kube-scheduler/extender/v1"
apitesting "k8s.io/kubernetes/pkg/api/testing"
apicore "k8s.io/kubernetes/pkg/apis/core"
kubefeatures "k8s.io/kubernetes/pkg/features"
schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/apis/config/scheme"
@@ -314,9 +313,15 @@ func TestCreateFromConfigWithUnspecifiedPredicatesOrPriorities(t *testing.T) {
}
func TestDefaultErrorFunc(t *testing.T) {
grace := int64(30)
testPod := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "bar"},
Spec: apitesting.V1DeepEqualSafePodSpec(),
Spec: v1.PodSpec{
RestartPolicy: v1.RestartPolicyAlways,
DNSPolicy: v1.DNSClusterFirst,
TerminationGracePeriodSeconds: &grace,
SecurityContext: &v1.PodSecurityContext{},
},
}
nodeBar, nodeFoo :=