diff --git a/changer/changer.go b/changer/changer.go index eaa84ea..32cd891 100644 --- a/changer/changer.go +++ b/changer/changer.go @@ -255,7 +255,7 @@ func (c *Changer) recoverRestart(appName, appGUID, oldStack, packageGUID, oldDro fmt.Printf(RestagingMsg, oldStack) - return c.restartNonZDT(appName, appGUID) + return nil } func parsePackageFromDroplet(curDropletResp []string) (string, error) { diff --git a/integration/integration_test.go b/integration/integration_test.go index dc89515..fcad147 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -144,7 +144,7 @@ func testIntegration(t *testing.T, when spec.G, it spec.S) { //TODO: understand why we can't confirm zero down breaker := make(chan bool) go confirmZeroDowntime(app, breaker, "when the cannot run on the target stack it restarts itself on the old stack") - defer cleanUpRoutines(breaker) + // defer cleanUpRoutines(breaker) cmd := exec.Command("cf", "change-stack", app.Name, newStack) out, err := cmd.CombinedOutput() @@ -156,6 +156,7 @@ func testIntegration(t *testing.T, when spec.G, it spec.S) { fmt.Println("eventually") return app.GetBody("/") }, 3*time.Minute).Should(ContainSubstring(appBody)) + close(breaker) }) }) })