From ff8c772fe0a1a5f7eab358942a08b4673a6bd75b Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Mon, 25 May 2015 10:20:34 +0200 Subject: [PATCH] Increase timeout for deleting RC in e2e tests. --- pkg/kubectl/stop.go | 4 ++++ test/e2e/util.go | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go index 69549ad7b25..90cd32d5d73 100644 --- a/pkg/kubectl/stop.go +++ b/pkg/kubectl/stop.go @@ -60,6 +60,10 @@ func ReaperFor(kind string, c client.Interface) (Reaper, error) { return nil, &NoSuchReaperError{kind} } +func ReaperForReplicationController(c client.Interface, timeout time.Duration) (Reaper, error) { + return &ReplicationControllerReaper{c, Interval, timeout}, nil +} + type ReplicationControllerReaper struct { client.Interface pollInterval, timeout time.Duration diff --git a/test/e2e/util.go b/test/e2e/util.go index 5581952de49..c31b08449cf 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -827,11 +827,14 @@ func waitForRCPodsRunning(c *client.Client, ns, rcName string) error { // Delete a Replication Controller and all pods it spawned func DeleteRC(c *client.Client, ns, name string) error { By(fmt.Sprintf("Deleting replication controller %s in namespace %s", name, ns)) - reaper, err := kubectl.ReaperFor("ReplicationController", c) + reaper, err := kubectl.ReaperForReplicationController(c, 10*time.Minute) if err != nil { return err } + startTime := time.Now() _, err = reaper.Stop(ns, name, api.NewDeleteOptions(0)) + deleteRCTime := time.Now().Sub(startTime) + Logf("Deleting RC took: %v", deleteRCTime) return err }