github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 15:05:20 +00:00
Code Issues Projects Releases Wiki Activity

cleanup test code in lifecycle, servicecatalog and ui package

Browse Source
This commit is contained in:
carlory
2019-08-27 09:51:23 +08:00
parent 1afcd7d0c8
commit 2301a3b15b
14 changed files with 61 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/ui/BUILD
View File

@@ -14,7 +14,6 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/log:go_default_library",
"//test/e2e/framework/service:go_default_library",
"//test/utils:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",

9
test/e2e/ui/dashboard.go
View File

@@ -26,7 +26,6 @@ import (
utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
testutils "k8s.io/kubernetes/test/utils"
@@ -65,7 +64,7 @@ var _ = SIGDescribe("Kubernetes Dashboard [Feature:Dashboard]", func() {
var status int
proxyRequest, errProxy := e2eservice.GetServicesProxyRequest(f.ClientSet, f.ClientSet.CoreV1().RESTClient().Get())
if errProxy != nil {
e2elog.Logf("Get services proxy request failed: %v", errProxy)
framework.Logf("Get services proxy request failed: %v", errProxy)
}
ctx, cancel := context.WithTimeout(context.Background(), framework.SingleCallTimeout)
@@ -81,12 +80,12 @@ var _ = SIGDescribe("Kubernetes Dashboard [Feature:Dashboard]", func() {
Error()
if err != nil {
if ctx.Err() != nil {
e2elog.Failf("Request to kubernetes-dashboard failed: %v", err)
framework.Failf("Request to kubernetes-dashboard failed: %v", err)
return true, err
}
e2elog.Logf("Request to kubernetes-dashboard failed: %v", err)
framework.Logf("Request to kubernetes-dashboard failed: %v", err)
} else if status != http.StatusOK {
e2elog.Logf("Unexpected status from kubernetes-dashboard: %v", status)
framework.Logf("Unexpected status from kubernetes-dashboard: %v", status)
}
// Don't return err here as it aborts polling.
return status == http.StatusOK, nil