@@ -331,8 +331,10 @@ func IsDeploymentCancelled(deployment *api.ReplicationController) bool {

 	return strings.EqualFold(value, deployapi.DeploymentCancelledAnnotationValue)

 }

-func HasSynced(dc *deployapi.DeploymentConfig) bool {

-	return dc.Status.ObservedGeneration >= dc.Generation

+// HasSynced checks if the provided deployment config has been noticed by the deployment

+// config controller.

+func HasSynced(dc *deployapi.DeploymentConfig, generation int64) bool {

+	return dc.Status.ObservedGeneration >= generation

 }

 // IsOwnedByConfig checks whether the provided replication controller is part of a

@@ -216,7 +216,7 @@ var _ = g.Describe("deploymentconfigs", func() {

 			o.Expect(err).NotTo(o.HaveOccurred())

 			g.By("ensuring no scale up of the deployment happens")

-			wait.Poll(100*time.Millisecond, 10*time.Second, func() (bool, error) {

+			wait.PollImmediate(100*time.Millisecond, 10*time.Second, func() (bool, error) {

 				rc, err := oc.KubeREST().ReplicationControllers(oc.Namespace()).Get("deployment-test-1")

 				o.Expect(err).NotTo(o.HaveOccurred())

 				o.Expect(rc.Spec.Replicas).Should(o.BeEquivalentTo(0))

@@ -396,53 +396,80 @@ var _ = g.Describe("deploymentconfigs", func() {

 			o.Expect(err).NotTo(o.HaveOccurred())

 			g.By("verifying that both latestVersion and generation are updated")

-			version, err := oc.Run("get").Args(resource, "--output=jsonpath=\"{.status.latestVersion}\"").Output()

-			version = strings.Trim(version, "\"")

-			o.Expect(err).NotTo(o.HaveOccurred())

-			g.By(fmt.Sprintf("checking the latest version for %s: %s", resource, version))

-			o.Expect(version).To(o.ContainSubstring("1"))

-			generation, err := oc.Run("get").Args(resource, "--output=jsonpath=\"{.metadata.generation}\"").Output()

-			o.Expect(err).NotTo(o.HaveOccurred())

-			g.By(fmt.Sprintf("checking the generation for %s: %s", resource, generation))

-			o.Expect(generation).To(o.ContainSubstring("1"))

+			var generation, version string

+			err = wait.PollImmediate(500*time.Millisecond, 10*time.Second, func() (bool, error) {

+				version, err = oc.Run("get").Args(resource, "--output=jsonpath=\"{.status.latestVersion}\"").Output()

+				if err != nil {

+					return false, nil

+				}

+				version = strings.Trim(version, "\"")

+				g.By(fmt.Sprintf("checking the latest version for %s: %s", resource, version))

-			g.By("verifying the deployment is marked complete")

-			err = wait.Poll(100*time.Millisecond, 1*time.Minute, func() (bool, error) {

-				rc, err := oc.KubeREST().ReplicationControllers(oc.Namespace()).Get(name + "-" + version)

-				o.Expect(err).NotTo(o.HaveOccurred())

-				return deployutil.IsTerminatedDeployment(rc), nil

+				generation, err = oc.Run("get").Args(resource, "--output=jsonpath=\"{.metadata.generation}\"").Output()

+				if err != nil {

+					return false, nil

+				}

+				generation = strings.Trim(generation, "\"")

+				g.By(fmt.Sprintf("checking the generation for %s: %s", resource, generation))

+

+				return strings.Contains(generation, "1") && strings.Contains(version, "1"), nil

 			})

+			if err == wait.ErrWaitTimeout {

+				err = fmt.Errorf("expected generation: 1, got: %s, expected latestVersion: 1, got: %s", generation, version)

+			}

 			o.Expect(err).NotTo(o.HaveOccurred())

+			g.By("verifying the deployment is marked complete")

+			o.Expect(waitForLatestCondition(oc, name, deploymentRunTimeout, deploymentReachedCompletion)).NotTo(o.HaveOccurred())

+

 			g.By("verifying that scaling updates the generation")

 			_, err = oc.Run("scale").Args(resource, "--replicas=2").Output()

 			o.Expect(err).NotTo(o.HaveOccurred())

-			generation, err = oc.Run("get").Args(resource, "--output=jsonpath=\"{.metadata.generation}\"").Output()

+

+			err = wait.PollImmediate(500*time.Millisecond, 10*time.Second, func() (bool, error) {

+				generation, err = oc.Run("get").Args(resource, "--output=jsonpath=\"{.metadata.generation}\"").Output()

+				if err != nil {

+					return false, nil

+				}

+				generation = strings.Trim(generation, "\"")

+				g.By(fmt.Sprintf("checking the generation for %s: %s", resource, generation))

+

+				return strings.Contains(generation, "2"), nil

+			})

+			if err == wait.ErrWaitTimeout {

+				err = fmt.Errorf("expected generation: 2, got: %s", generation)

+			}

 			o.Expect(err).NotTo(o.HaveOccurred())

-			g.By(fmt.Sprintf("checking the generation for %s: %s", resource, generation))

-			o.Expect(generation).To(o.ContainSubstring("2"))

 			g.By("deploying a second time [new client]")

 			_, err = oc.Run("deploy").Args("--latest", name).Output()

 			o.Expect(err).NotTo(o.HaveOccurred())

 			g.By("verifying that both latestVersion and generation are updated")

-			version, err = oc.Run("get").Args(resource, "--output=jsonpath=\"{.status.latestVersion}\"").Output()

-			version = strings.Trim(version, "\"")

-			o.Expect(err).NotTo(o.HaveOccurred())

-			g.By(fmt.Sprintf("checking the latest version for %s: %s", resource, version))

-			o.Expect(version).To(o.ContainSubstring("2"))

-			generation, err = oc.Run("get").Args(resource, "--output=jsonpath=\"{.metadata.generation}\"").Output()

+			err = wait.PollImmediate(500*time.Millisecond, 10*time.Second, func() (bool, error) {

+				version, err = oc.Run("get").Args(resource, "--output=jsonpath=\"{.status.latestVersion}\"").Output()

+				if err != nil {

+					return false, nil

+				}

+				version = strings.Trim(version, "\"")

+				g.By(fmt.Sprintf("checking the latest version for %s: %s", resource, version))

+

+				generation, err = oc.Run("get").Args(resource, "--output=jsonpath=\"{.metadata.generation}\"").Output()

+				if err != nil {

+					return false, nil

+				}

+				generation = strings.Trim(generation, "\"")

+				g.By(fmt.Sprintf("checking the generation for %s: %s", resource, generation))

+

+				return strings.Contains(generation, "3") && strings.Contains(version, "2"), nil

+			})

+			if err == wait.ErrWaitTimeout {

+				err = fmt.Errorf("expected generation: 3, got: %s, expected latestVersion: 2, got: %s", generation, version)

+			}

 			o.Expect(err).NotTo(o.HaveOccurred())

-			g.By(fmt.Sprintf("checking the generation for %s: %s", resource, generation))

-			o.Expect(generation).To(o.ContainSubstring("3"))

 			g.By("verifying that observedGeneration equals generation")

-			err = wait.Poll(1*time.Second, 1*time.Minute, func() (bool, error) {

-				dc, _, _, err := deploymentInfo(oc, name)

-				o.Expect(err).NotTo(o.HaveOccurred())

-				return deployutil.HasSynced(dc), nil

-			})

+			o.Expect(waitForSyncedConfig(oc, name, deploymentRunTimeout)).NotTo(o.HaveOccurred())

 		})

 	})

@@ -613,7 +640,7 @@ var _ = g.Describe("deploymentconfigs", func() {

 				o.Expect(out).To(o.ContainSubstring("updated"))

 			}

-			o.Expect(waitForLatestCondition(oc, "history-limit", deploymentRunTimeout, checkDeploymentConfigHasSynced)).NotTo(o.HaveOccurred(),

+			o.Expect(waitForSyncedConfig(oc, "history-limit", deploymentRunTimeout)).NotTo(o.HaveOccurred(),

 				"the controller needs to have synced with the updated deployment configuration before checking that the revision history limits are being adhered to")

 			deploymentConfig, deployments, _, err := deploymentInfo(oc, "history-limit")

 			o.Expect(err).NotTo(o.HaveOccurred())

@@ -262,7 +262,7 @@ func deploymentInfo(oc *exutil.CLI, name string) (*deployapi.DeploymentConfig, [

 type deploymentConditionFunc func(dc *deployapi.DeploymentConfig, rcs []kapi.ReplicationController, pods []kapi.Pod) (bool, error)

 func waitForLatestCondition(oc *exutil.CLI, name string, timeout time.Duration, fn deploymentConditionFunc) error {

-	return wait.Poll(200*time.Millisecond, timeout, func() (bool, error) {

+	return wait.PollImmediate(200*time.Millisecond, timeout, func() (bool, error) {

 		dc, rcs, pods, err := deploymentInfo(oc, name)

 		if err != nil {

 			return false, err

@@ -274,6 +274,20 @@ func waitForLatestCondition(oc *exutil.CLI, name string, timeout time.Duration,

 	})

 }

+func waitForSyncedConfig(oc *exutil.CLI, name string, timeout time.Duration) error {

+	dc, rcs, pods, err := deploymentInfo(oc, name)

+	if err != nil {

+		return err

+	}

+	if err := checkDeploymentInvariants(dc, rcs, pods); err != nil {

+		return err

+	}

+	generation := dc.Generation

+	return wait.PollImmediate(200*time.Millisecond, timeout, func() (bool, error) {

+		return deployutil.HasSynced(dc, generation), nil

+	})

+}

+

 // createFixture will create the provided fixture and return the resource and the

 // name separately.

 // TODO: Probably move to a more general location like test/extended/util/cli.go

@@ -326,7 +340,3 @@ func failureTrap(oc *exutil.CLI, name string, failed bool) {

 		}

 	}

 }

-

-func checkDeploymentConfigHasSynced(dc *deployapi.DeploymentConfig, _ []kapi.ReplicationController, _ []kapi.Pod) (bool, error) {

-	return deployutil.HasSynced(dc), nil

-}

@@ -47,13 +47,14 @@ func TestDeployScale(t *testing.T) {

 	if err != nil {

 		t.Fatalf("Couldn't create DeploymentConfig: %v %#v", err, config)

 	}

+	generation := dc.Generation

 	condition := func() (bool, error) {

 		config, err := osClient.DeploymentConfigs(namespace).Get(dc.Name)

 		if err != nil {

 			return false, nil

 		}

-		return deployutil.HasSynced(config), nil

+		return deployutil.HasSynced(config, generation), nil

 	}

 	if err := wait.PollImmediate(500*time.Millisecond, 10*time.Second, condition); err != nil {

 		t.Fatalf("Deployment config never synced: %v", err)