github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30994 from gmarek/unused

Browse Source 
Automatic merge from submit-queue

Stop pretending that reaper cares about delete options in e2e tests
This commit is contained in:
Kubernetes Submit Queue
2016-08-19 15:48:00 -07:00
committed by GitHub
parent 78cb692327 d844dd463a
commit ea5a17fbce
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/framework/util.go
View File

@@ -3077,16 +3077,16 @@ func DeleteRCAndPods(c *client.Client, ns, name string) error {
}
defer ps.Stop()
startTime := time.Now()
err = reaper.Stop(ns, name, 0, api.NewDeleteOptions(0))
err = reaper.Stop(ns, name, 0, nil)
if apierrs.IsNotFound(err) {
Logf("RC %s was already deleted: %v", name, err)
return nil
}
deleteRCTime := time.Now().Sub(startTime)
Logf("Deleting RC %s took: %v", name, deleteRCTime)
if err != nil {
return fmt.Errorf("error while stopping RC: %s: %v", name, err)
}
deleteRCTime := time.Now().Sub(startTime)
Logf("Deleting RC %s took: %v", name, deleteRCTime)
err = waitForPodsInactive(ps, 10*time.Millisecond, 10*time.Minute)
if err != nil {
return fmt.Errorf("error while waiting for pods to become inactive %s: %v", name, err)
@@ -3219,7 +3219,7 @@ func DeleteReplicaSet(c *client.Client, ns, name string) error {
return err
}
startTime := time.Now()
err = reaper.Stop(ns, name, 0, api.NewDeleteOptions(0))
err = reaper.Stop(ns, name, 0, nil)
if apierrs.IsNotFound(err) {
Logf("ReplicaSet %s was already deleted: %v", name, err)
return nil