github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dependency for integration framework tests from e2e fw

Browse Source
This commit is contained in:
drfish
2020-03-18 22:59:51 +08:00
parent 22a4c2cda1
commit 437765db22
3 changed files with 248 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/integration/framework/perf_utils.go
View File

@@ -18,14 +18,13 @@ package framework
import (
"context"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clientset "k8s.io/client-go/kubernetes"
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
testutils "k8s.io/kubernetes/test/utils"
"k8s.io/klog"
testutils "k8s.io/kubernetes/test/utils"
)
const (
@@ -100,7 +99,7 @@ func (p *IntegrationTestNodePreparer) PrepareNodes() error {
}
}
nodes, err := e2enode.GetReadySchedulableNodes(p.client)
nodes, err := GetReadySchedulableNodes(p.client)
if err != nil {
klog.Fatalf("Error listing nodes: %v", err)
}
@@ -120,7 +119,7 @@ func (p *IntegrationTestNodePreparer) PrepareNodes() error {
// CleanupNodes deletes existing test nodes.
func (p *IntegrationTestNodePreparer) CleanupNodes() error {
nodes, err := e2enode.GetReadySchedulableNodes(p.client)
nodes, err := GetReadySchedulableNodes(p.client)
if err != nil {
klog.Fatalf("Error listing nodes: %v", err)
}