Fixes for canary integration tests

Author: Samze

integration/v7/isolated/app_command_test.go

@@ -285,7 +285,7 @@ applications:
 							session1 := helpers.CF("app", appName)
 							Eventually(session1).Should(Say("Active deployment with status PAUSED"))
 							Eventually(session1).Should(Say("strategy:        canary"))
-							Expect(session1).To(Say("canary-steps:    0/1"))
+							Expect(session1).To(Say("canary-steps:    1/1"))
 							Eventually(session1).Should(Exit(0))
 						})
 					})

integration/v7/isolated/copy_source_command_test.go

@@ -391,7 +391,7 @@ var _ = Describe("copy-source command", func() {
 			Eventually(session).Should(Say("Active deployment with status PAUSED"))
 			Eventually(session).Should(Say("strategy:        canary"))
 			Eventually(session).Should(Say("max-in-flight:   1"))
-			Eventually(session).Should(Say("canary-steps:   1/2"))
+			Eventually(session).Should(Say("canary-steps:    1/2"))
 			Eventually(session).Should(Say("Please run `cf continue-deployment %s` to promote the canary deployment, or `cf cancel-deployment %s` to rollback to the previous version.", targetAppName, targetAppName))
 			Eventually(session).Should(Exit(0))
 

integration/v7/isolated/restage_command_test.go

@@ -247,10 +247,10 @@ applications:
 					})
 				})
 
-				When("strategy canary is given with a non-default max-in-flight value and instance-weights", func() {
+				When("strategy canary is given with a non-default max-in-flight value and instance-steps", func() {
 					It("restages successfully and notes the max-in-flight value", func() {
 						userName, _ := helpers.GetCredentials()
-						session := helpers.CF("restage", appName, "--strategy", "canary", "--max-in-flight", "2", "--instance-weights", "1,20")
+						session := helpers.CF("restage", appName, "--strategy", "canary", "--max-in-flight", "2", "--instance-steps", "1,20")
 						Consistently(session.Err).ShouldNot(Say(`This action will cause app downtime\.`))
 						Eventually(session).Should(Say(`Restaging app %s in org %s / space %s as %s\.\.\.`, appName, orgName, spaceName, userName))
 						Eventually(session).Should(Say(`Creating deployment for app %s\.\.\.`, appName))