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

refactor: replace framework.Failf with e2elog.Failf

Browse Source
This commit is contained in:
SataQiu
2019-06-19 17:52:35 +08:00
parent 9162d932cf
commit 332be4b1e3
144 changed files with 767 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/utils/crd/BUILD
View File

@@ -13,6 +13,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//staging/src/k8s.io/client-go/dynamic:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/log:go_default_library",
],
)

11
test/utils/crd/crd_util.go
View File

@@ -26,6 +26,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/dynamic"
"k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
)
// CleanCrdFn declares the clean up function needed to remove the CRD
@@ -52,17 +53,17 @@ func CreateMultiVersionTestCRD(f *framework.Framework, group string, opts ...Opt
// Creating a custom resource definition for use by assorted tests.
config, err := framework.LoadConfig()
if err != nil {
framework.Failf("failed to load config: %v", err)
e2elog.Failf("failed to load config: %v", err)
return nil, err
}
apiExtensionClient, err := crdclientset.NewForConfig(config)
if err != nil {
framework.Failf("failed to initialize apiExtensionClient: %v", err)
e2elog.Failf("failed to initialize apiExtensionClient: %v", err)
return nil, err
}
dynamicClient, err := dynamic.NewForConfig(config)
if err != nil {
framework.Failf("failed to initialize dynamic client: %v", err)
e2elog.Failf("failed to initialize dynamic client: %v", err)
return nil, err
}
@@ -89,7 +90,7 @@ func CreateMultiVersionTestCRD(f *framework.Framework, group string, opts ...Opt
//create CRD and waits for the resource to be recognized and available.
crd, err = fixtures.CreateNewCustomResourceDefinitionWatchUnsafe(crd, apiExtensionClient)
if err != nil {
framework.Failf("failed to create CustomResourceDefinition: %v", err)
e2elog.Failf("failed to create CustomResourceDefinition: %v", err)
return nil, err
}
@@ -107,7 +108,7 @@ func CreateMultiVersionTestCRD(f *framework.Framework, group string, opts ...Opt
testcrd.CleanUp = func() error {
err := fixtures.DeleteCustomResourceDefinition(crd, apiExtensionClient)
if err != nil {
framework.Failf("failed to delete CustomResourceDefinition(%s): %v", name, err)
e2elog.Failf("failed to delete CustomResourceDefinition(%s): %v", name, err)
}
return err
}