github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22169 from wojtek-t/more_readable_load_log

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-29 05:09:39 -08:00
commit ce2556decf
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/util.go
View File

@ -2165,12 +2165,16 @@ func DeleteRC(c *client.Client, ns, name string) error {
} }
deleteRCTime := time.Now().Sub(startTime) deleteRCTime := time.Now().Sub(startTime)
Logf("Deleting RC %s took: %v", name, deleteRCTime) Logf("Deleting RC %s took: %v", name, deleteRCTime)
if err == nil { if err != nil {
err = waitForRCPodsGone(c, rc) return fmt.Errorf("error while stopping RC: %s: %v", name, err)
}
err = waitForRCPodsGone(c, rc)
if err != nil {
return fmt.Errorf("error while deleting RC %s: %v", name, err)
} }
terminatePodTime := time.Now().Sub(startTime) - deleteRCTime terminatePodTime := time.Now().Sub(startTime) - deleteRCTime
Logf("Terminating RC %s pods took: %v", name, terminatePodTime) Logf("Terminating RC %s pods took: %v", name, terminatePodTime)
return err return nil
} }
// waitForRCPodsGone waits until there are no pods reported under an RC's selector (because the pods // waitForRCPodsGone waits until there are no pods reported under an RC's selector (because the pods