github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-02 17:57:33 +00:00
Code Issues Projects Releases Wiki Activity

Stop pretending that reaper cares about delete options in e2e tests

Browse Source
This commit is contained in:
gmarek
2016-08-19 14:32:58 +02:00
parent 6b20896fea
commit d844dd463a
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() defer ps.Stop()
startTime := time.Now() startTime := time.Now()
err = reaper.Stop(ns, name, 0, api.NewDeleteOptions(0)) err = reaper.Stop(ns, name, 0, nil)
if apierrs.IsNotFound(err) { if apierrs.IsNotFound(err) {
Logf("RC %s was already deleted: %v", name, err) Logf("RC %s was already deleted: %v", name, err)
return nil return nil
} }
deleteRCTime := time.Now().Sub(startTime)
Logf("Deleting RC %s took: %v", name, deleteRCTime)
if err != nil { if err != nil {
return fmt.Errorf("error while stopping RC: %s: %v", name, err) 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) err = waitForPodsInactive(ps, 10*time.Millisecond, 10*time.Minute)
if err != nil { if err != nil {
return fmt.Errorf("error while waiting for pods to become inactive %s: %v", name, err) 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 return err
} }
startTime := time.Now() startTime := time.Now()
err = reaper.Stop(ns, name, 0, api.NewDeleteOptions(0)) err = reaper.Stop(ns, name, 0, nil)
if apierrs.IsNotFound(err) { if apierrs.IsNotFound(err) {
Logf("ReplicaSet %s was already deleted: %v", name, err) Logf("ReplicaSet %s was already deleted: %v", name, err)
return nil return nil