github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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

12
test/e2e/lifecycle/ha_master.go
View File

@@ -28,12 +28,12 @@ import (
clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/common"
"k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
)
func addMasterReplica(zone string) error {
e2elog.Logf(fmt.Sprintf("Adding a new master replica, zone: %s", zone))
framework.Logf(fmt.Sprintf("Adding a new master replica, zone: %s", zone))
_, _, err := framework.RunCmd(path.Join(framework.TestContext.RepoRoot, "hack/e2e-internal/e2e-grow-cluster.sh"), zone, "true", "true", "false")
if err != nil {
return err
@@ -42,7 +42,7 @@ func addMasterReplica(zone string) error {
}
func removeMasterReplica(zone string) error {
e2elog.Logf(fmt.Sprintf("Removing an existing master replica, zone: %s", zone))
framework.Logf(fmt.Sprintf("Removing an existing master replica, zone: %s", zone))
_, _, err := framework.RunCmd(path.Join(framework.TestContext.RepoRoot, "hack/e2e-internal/e2e-shrink-cluster.sh"), zone, "true", "false", "false")
if err != nil {
return err
@@ -51,7 +51,7 @@ func removeMasterReplica(zone string) error {
}
func addWorkerNodes(zone string) error {
e2elog.Logf(fmt.Sprintf("Adding worker nodes, zone: %s", zone))
framework.Logf(fmt.Sprintf("Adding worker nodes, zone: %s", zone))
_, _, err := framework.RunCmd(path.Join(framework.TestContext.RepoRoot, "hack/e2e-internal/e2e-grow-cluster.sh"), zone, "true", "false", "true")
if err != nil {
return err
@@ -60,7 +60,7 @@ func addWorkerNodes(zone string) error {
}
func removeWorkerNodes(zone string) error {
e2elog.Logf(fmt.Sprintf("Removing worker nodes, zone: %s", zone))
framework.Logf(fmt.Sprintf("Removing worker nodes, zone: %s", zone))
_, _, err := framework.RunCmd(path.Join(framework.TestContext.RepoRoot, "hack/e2e-internal/e2e-shrink-cluster.sh"), zone, "true", "true", "true")
if err != nil {
return err
@@ -83,7 +83,7 @@ func findRegionForZone(zone string) string {
region, err := exec.Command("gcloud", "compute", "zones", "list", zone, "--quiet", "--format=csv[no-heading](region)").Output()
framework.ExpectNoError(err)
if string(region) == "" {
e2elog.Failf("Region not found; zone: %s", zone)
framework.Failf("Region not found; zone: %s", zone)
}
return string(region)
}