From db9ba1dc3fb624e9c08f604dc2684acc535c7ab9 Mon Sep 17 00:00:00 2001 From: Michail Kargakis Date: Mon, 24 Apr 2017 20:14:21 +0200 Subject: [PATCH] Deployment e2e test fixes * don't expect availability on Deployment creations * switch to framework.Logf everywhere for consistency * better use of Expect Signed-off-by: Michail Kargakis --- test/e2e/deployment.go | 146 +++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 85 deletions(-) diff --git a/test/e2e/deployment.go b/test/e2e/deployment.go index 9456227ee8e..70095198b60 100644 --- a/test/e2e/deployment.go +++ b/test/e2e/deployment.go @@ -54,6 +54,10 @@ const ( redisImageName = "redis" ) +var ( + nilRs *extensions.ReplicaSet +) + var _ = framework.KubeDescribe("Deployment", func() { f := framework.NewDefaultFramework("deployment") @@ -132,7 +136,7 @@ func checkDeploymentRevision(c clientset.Interface, ns, deploymentName, revision // Check revision of the new replica set of this deployment newRS, err := deploymentutil.GetNewReplicaSet(deployment, c) Expect(err).NotTo(HaveOccurred()) - Expect(newRS).NotTo(Equal(nil)) + Expect(newRS).NotTo(Equal(nilRs)) Expect(newRS.Annotations).NotTo(Equal(nil)) Expect(newRS.Annotations[deploymentutil.RevisionAnnotation]).Should(Equal(revision)) // Check revision of This deployment @@ -206,7 +210,7 @@ func testNewDeployment(f *framework.Framework) { err = framework.WaitForDeploymentRevisionAndImage(c, ns, deploymentName, "1", nginxImage) Expect(err).NotTo(HaveOccurred()) - err = framework.WaitForDeploymentStatus(c, deploy) + err = framework.WaitForDeploymentStatusValid(c, deploy) Expect(err).NotTo(HaveOccurred()) deployment, err := c.Extensions().Deployments(ns).Get(deploymentName, metav1.GetOptions{}) @@ -238,17 +242,14 @@ func testDeleteDeployment(f *framework.Framework) { err = framework.WaitForDeploymentRevisionAndImage(c, ns, deploymentName, "1", nginxImage) Expect(err).NotTo(HaveOccurred()) - err = framework.WaitForDeploymentStatus(c, deploy) + err = framework.WaitForDeploymentStatusValid(c, deploy) Expect(err).NotTo(HaveOccurred()) deployment, err := c.Extensions().Deployments(ns).Get(deploymentName, metav1.GetOptions{}) Expect(err).NotTo(HaveOccurred()) newRS, err := deploymentutil.GetNewReplicaSet(deployment, c) Expect(err).NotTo(HaveOccurred()) - if newRS == nil { - err = fmt.Errorf("expected a replica set, got nil") - Expect(err).NotTo(HaveOccurred()) - } + Expect(newRS).NotTo(Equal(nilRs)) stopDeployment(c, internalClient, ns, deploymentName) } @@ -269,34 +270,31 @@ func testRollingUpdateDeployment(f *framework.Framework) { annotations[deploymentutil.RevisionAnnotation] = rsRevision rs := newRS(rsName, replicas, rsPodLabels, nginxImageName, nginxImage) rs.Annotations = annotations - By(fmt.Sprintf("Creating replica set %q (going to be adopted)", rs.Name)) + framework.Logf("Creating replica set %q (going to be adopted)", rs.Name) _, err := c.Extensions().ReplicaSets(ns).Create(rs) Expect(err).NotTo(HaveOccurred()) // Verify that the required pods have come up. err = framework.VerifyPodsRunning(c, ns, "sample-pod", false, replicas) - if err != nil { - framework.Logf("error in waiting for pods to come up: %s", err) - Expect(err).NotTo(HaveOccurred()) - } + Expect(err).NotTo(HaveOccurred(), "error in waiting for pods to come up: %s", err) // Create a deployment to delete nginx pods and instead bring up redis pods. deploymentName := "test-rolling-update-deployment" - By(fmt.Sprintf("Creating deployment %q", deploymentName)) + framework.Logf("Creating deployment %q", deploymentName) d := framework.NewDeployment(deploymentName, replicas, deploymentPodLabels, redisImageName, redisImage, extensions.RollingUpdateDeploymentStrategyType) deploy, err := c.Extensions().Deployments(ns).Create(d) Expect(err).NotTo(HaveOccurred()) // Wait for it to be updated to revision 3546343826724305833. - By(fmt.Sprintf("Ensuring deployment %q gets the next revision from the one the adopted replica set %q has", deploy.Name, rs.Name)) + framework.Logf("Ensuring deployment %q gets the next revision from the one the adopted replica set %q has", deploy.Name, rs.Name) err = framework.WaitForDeploymentRevisionAndImage(c, ns, deploymentName, "3546343826724305833", redisImage) Expect(err).NotTo(HaveOccurred()) - By(fmt.Sprintf("Ensuring status for deployment %q is the expected", deploy.Name)) - err = framework.WaitForDeploymentStatus(c, deploy) + framework.Logf("Ensuring status for deployment %q is the expected", deploy.Name) + err = framework.WaitForDeploymentStatusValid(c, deploy) Expect(err).NotTo(HaveOccurred()) // There should be 1 old RS (nginx-controller, which is adopted) - By(fmt.Sprintf("Ensuring deployment %q has one old replica set (the one it adopted)", deploy.Name)) + framework.Logf("Ensuring deployment %q has one old replica set (the one it adopted)", deploy.Name) deployment, err := c.Extensions().Deployments(ns).Get(deploymentName, metav1.GetOptions{}) Expect(err).NotTo(HaveOccurred()) _, allOldRSs, err := deploymentutil.GetOldReplicaSets(deployment, c) @@ -314,28 +312,28 @@ func testRecreateDeployment(f *framework.Framework) { // Create a deployment that brings up redis pods. deploymentName := "test-recreate-deployment" - By(fmt.Sprintf("Creating deployment %q", deploymentName)) + framework.Logf("Creating deployment %q", deploymentName) d := framework.NewDeployment(deploymentName, int32(1), map[string]string{"name": "sample-pod-3"}, redisImageName, redisImage, extensions.RecreateDeploymentStrategyType) deployment, err := c.Extensions().Deployments(ns).Create(d) Expect(err).NotTo(HaveOccurred()) // Wait for it to be updated to revision 1 - By(fmt.Sprintf("Waiting deployment %q to be updated to revision 1", deploymentName)) + framework.Logf("Waiting deployment %q to be updated to revision 1", deploymentName) err = framework.WaitForDeploymentRevisionAndImage(c, ns, deploymentName, "1", redisImage) Expect(err).NotTo(HaveOccurred()) - By(fmt.Sprintf("Waiting deployment %q to complete", deploymentName)) + framework.Logf("Waiting deployment %q to complete", deploymentName) Expect(framework.WaitForDeploymentStatusValid(c, deployment)).NotTo(HaveOccurred()) // Update deployment to delete redis pods and bring up nginx pods. - By(fmt.Sprintf("Triggering a new rollout for deployment %q", deploymentName)) + framework.Logf("Triggering a new rollout for deployment %q", deploymentName) deployment, err = framework.UpdateDeploymentWithRetries(c, ns, deploymentName, func(update *extensions.Deployment) { update.Spec.Template.Spec.Containers[0].Name = nginxImageName update.Spec.Template.Spec.Containers[0].Image = nginxImage }) Expect(err).NotTo(HaveOccurred()) - By(fmt.Sprintf("Watching deployment %q to verify that new pods will not run with olds pods", deploymentName)) + framework.Logf("Watching deployment %q to verify that new pods will not run with olds pods", deploymentName) Expect(framework.WatchRecreateDeployment(c, deployment)).NotTo(HaveOccurred()) } @@ -357,19 +355,15 @@ func testDeploymentCleanUpPolicy(f *framework.Framework) { // Verify that the required pods have come up. err = framework.VerifyPodsRunning(c, ns, "cleanup-pod", false, replicas) - if err != nil { - framework.Logf("error in waiting for pods to come up: %s", err) - Expect(err).NotTo(HaveOccurred()) - } + Expect(err).NotTo(HaveOccurred(), "error in waiting for pods to come up: %v", err) // Create a deployment to delete nginx pods and instead bring up redis pods. deploymentName := "test-cleanup-deployment" - By(fmt.Sprintf("Creating deployment %s", deploymentName)) + framework.Logf("Creating deployment %s", deploymentName) pods, err := c.Core().Pods(ns).List(metav1.ListOptions{LabelSelector: labels.Everything().String()}) - if err != nil { - Expect(err).NotTo(HaveOccurred(), "Failed to query for pods: %v", err) - } + Expect(err).NotTo(HaveOccurred(), "Failed to query for pods: %v", err) + options := metav1.ListOptions{ ResourceVersion: pods.ListMeta.ResourceVersion, } @@ -393,7 +387,7 @@ func testDeploymentCleanUpPolicy(f *framework.Framework) { } pod, ok := event.Object.(*v1.Pod) if !ok { - Fail("Expect event Object to be a pod") + framework.Failf("Expect event Object to be a pod") } if pod.Spec.Containers[0].Name != redisImageName { framework.Failf("Expect the created pod to have container name %s, got pod %#v\n", redisImageName, pod) @@ -431,10 +425,7 @@ func testRolloverDeployment(f *framework.Framework) { Expect(err).NotTo(HaveOccurred()) // Verify that the required pods have come up. err = framework.VerifyPodsRunning(c, ns, podName, false, rsReplicas) - if err != nil { - framework.Logf("error in waiting for pods to come up: %s", err) - Expect(err).NotTo(HaveOccurred()) - } + Expect(err).NotTo(HaveOccurred(), "error in waiting for pods to come up: %v", err) // Wait for replica set to become ready before adopting it. framework.Logf("Waiting for pods owned by replica set %q to become ready", rsName) @@ -532,10 +523,7 @@ func testPausedDeployment(f *framework.Framework) { // Verify that there is no latest state realized for the new deployment. rs, err := deploymentutil.GetNewReplicaSet(deployment, c) Expect(err).NotTo(HaveOccurred()) - if rs != nil { - err = fmt.Errorf("unexpected new rs/%s for deployment/%s", rs.Name, deployment.Name) - Expect(err).NotTo(HaveOccurred()) - } + Expect(rs).To(Equal(nilRs)) // Update the deployment to run deployment, err = framework.UpdateDeploymentWithRetries(c, ns, d.Name, func(update *extensions.Deployment) { @@ -587,10 +575,7 @@ func testPausedDeployment(f *framework.Framework) { framework.Logf("Looking for new replicaset for paused deployment %q (there should be none)", deploymentName) newRS, err := deploymentutil.GetNewReplicaSet(deployment, c) Expect(err).NotTo(HaveOccurred()) - if newRS != nil { - err = fmt.Errorf("No replica set should match the deployment template but there is %q", newRS.Name) - Expect(err).NotTo(HaveOccurred()) - } + Expect(newRS).To(Equal(nilRs)) _, allOldRs, err := deploymentutil.GetOldReplicaSets(deployment, c) Expect(err).NotTo(HaveOccurred()) @@ -630,7 +615,7 @@ func testRollbackDeployment(f *framework.Framework) { err = framework.WaitForDeploymentRevisionAndImage(c, ns, deploymentName, "1", deploymentImage) Expect(err).NotTo(HaveOccurred()) - err = framework.WaitForDeploymentStatus(c, deploy) + err = framework.WaitForDeploymentStatusValid(c, deploy) Expect(err).NotTo(HaveOccurred()) // Current newRS annotation should be "create" @@ -748,7 +733,7 @@ func testRollbackDeploymentRSNoRevision(f *framework.Framework) { err = framework.WaitForDeploymentRevisionAndImage(c, ns, deploymentName, "1", deploymentImage) Expect(err).NotTo(HaveOccurred()) - err = framework.WaitForDeploymentStatus(c, deploy) + err = framework.WaitForDeploymentStatusValid(c, deploy) Expect(err).NotTo(HaveOccurred()) // Check that the replica set we created still doesn't contain revision information @@ -862,10 +847,7 @@ func testDeploymentLabelAdopted(f *framework.Framework) { Expect(err).NotTo(HaveOccurred()) // Verify that the required pods have come up. err = framework.VerifyPodsRunning(c, ns, podName, false, replicas) - if err != nil { - framework.Logf("error in waiting for pods to come up: %s", err) - Expect(err).NotTo(HaveOccurred()) - } + Expect(err).NotTo(HaveOccurred(), "error in waiting for pods to come up: %v", err) // Create a nginx deployment to adopt the old rs. deploymentName := "test-adopted-deployment" @@ -878,7 +860,7 @@ func testDeploymentLabelAdopted(f *framework.Framework) { Expect(err).NotTo(HaveOccurred()) // The RS and pods should be relabeled before the status is updated by syncRollingUpdateDeployment - err = framework.WaitForDeploymentStatus(c, deploy) + err = framework.WaitForDeploymentStatusValid(c, deploy) Expect(err).NotTo(HaveOccurred()) // There should be no old RSs (overlapping RS) @@ -950,11 +932,7 @@ func testScalePausedDeployment(f *framework.Framework) { rs, err := deploymentutil.GetNewReplicaSet(deployment, c) Expect(err).NotTo(HaveOccurred()) - - if *(rs.Spec.Replicas) != newReplicas { - err = fmt.Errorf("Expected %d replicas for the new replica set, got %d", newReplicas, *(rs.Spec.Replicas)) - Expect(err).NotTo(HaveOccurred()) - } + Expect(*(rs.Spec.Replicas)).Should(Equal(newReplicas)) } func testScaledRolloutDeployment(f *framework.Framework) { @@ -971,34 +949,32 @@ func testScaledRolloutDeployment(f *framework.Framework) { d.Spec.Strategy.RollingUpdate.MaxSurge = intOrStrP(3) d.Spec.Strategy.RollingUpdate.MaxUnavailable = intOrStrP(2) - By(fmt.Sprintf("Creating deployment %q", deploymentName)) + framework.Logf("Creating deployment %q", deploymentName) deployment, err := c.Extensions().Deployments(ns).Create(d) Expect(err).NotTo(HaveOccurred()) - By(fmt.Sprintf("Waiting for observed generation %d", deployment.Generation)) + framework.Logf("Waiting for observed generation %d", deployment.Generation) Expect(framework.WaitForObservedDeployment(c, ns, deploymentName, deployment.Generation)).NotTo(HaveOccurred()) // Verify that the required pods have come up. - By("Waiting for all required pods to come up") + framework.Logf("Waiting for all required pods to come up") err = framework.VerifyPodsRunning(f.ClientSet, ns, nginxImageName, false, *(deployment.Spec.Replicas)) - if err != nil { - framework.Logf("error in waiting for pods to come up: %s", err) - Expect(err).NotTo(HaveOccurred()) - } - By(fmt.Sprintf("Waiting for deployment %q to complete", deployment.Name)) + Expect(err).NotTo(HaveOccurred(), "error in waiting for pods to come up: %v", err) + + framework.Logf("Waiting for deployment %q to complete", deployment.Name) Expect(framework.WaitForDeploymentStatusValid(c, deployment)).NotTo(HaveOccurred()) first, err := deploymentutil.GetNewReplicaSet(deployment, c) Expect(err).NotTo(HaveOccurred()) // Update the deployment with a non-existent image so that the new replica set will be blocked. - By(fmt.Sprintf("Updating deployment %q with a non-existent image", deploymentName)) + framework.Logf("Updating deployment %q with a non-existent image", deploymentName) deployment, err = framework.UpdateDeploymentWithRetries(c, ns, d.Name, func(update *extensions.Deployment) { update.Spec.Template.Spec.Containers[0].Image = "nginx:404" }) Expect(err).NotTo(HaveOccurred()) - By(fmt.Sprintf("Waiting for observed generation %d", deployment.Generation)) + framework.Logf("Waiting for observed generation %d", deployment.Generation) err = framework.WaitForObservedDeployment(c, ns, deploymentName, deployment.Generation) Expect(err).NotTo(HaveOccurred()) @@ -1009,7 +985,7 @@ func testScaledRolloutDeployment(f *framework.Framework) { Expect(fmt.Errorf("Observed %d available replicas, less than min required %d", deployment.Status.AvailableReplicas, deploymentutil.MinAvailable(deployment))).NotTo(HaveOccurred()) } - By(fmt.Sprintf("Checking that the replica sets for %q are synced", deploymentName)) + framework.Logf("Checking that the replica sets for %q are synced", deploymentName) second, err := deploymentutil.GetNewReplicaSet(deployment, c) Expect(err).NotTo(HaveOccurred()) @@ -1024,7 +1000,7 @@ func testScaledRolloutDeployment(f *framework.Framework) { err = wait.PollImmediate(10*time.Millisecond, 1*time.Minute, secondCond) Expect(err).NotTo(HaveOccurred()) - By(fmt.Sprintf("Updating the size (up) and template at the same time for deployment %q", deploymentName)) + framework.Logf("Updating the size (up) and template at the same time for deployment %q", deploymentName) newReplicas := int32(20) deployment, err = framework.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *extensions.Deployment) { update.Spec.Replicas = &newReplicas @@ -1035,14 +1011,14 @@ func testScaledRolloutDeployment(f *framework.Framework) { err = framework.WaitForObservedDeployment(c, ns, deploymentName, deployment.Generation) Expect(err).NotTo(HaveOccurred()) - By(fmt.Sprintf("Waiting for deployment status to sync (current available: %d, minimum available: %d)", deployment.Status.AvailableReplicas, deploymentutil.MinAvailable(deployment))) + framework.Logf("Waiting for deployment status to sync (current available: %d, minimum available: %d)", deployment.Status.AvailableReplicas, deploymentutil.MinAvailable(deployment)) Expect(framework.WaitForDeploymentStatusValid(c, deployment)).NotTo(HaveOccurred()) oldRSs, _, rs, err := deploymentutil.GetAllReplicaSets(deployment, c) Expect(err).NotTo(HaveOccurred()) for _, rs := range append(oldRSs, rs) { - By(fmt.Sprintf("Ensuring replica set %q has the correct desiredReplicas annotation", rs.Name)) + framework.Logf("Ensuring replica set %q has the correct desiredReplicas annotation", rs.Name) desired, ok := deploymentutil.GetDesiredReplicasAnnotation(rs) if !ok || desired == *(deployment.Spec.Replicas) { continue @@ -1052,13 +1028,13 @@ func testScaledRolloutDeployment(f *framework.Framework) { } // Update the deployment with a non-existent image so that the new replica set will be blocked. - By(fmt.Sprintf("Updating deployment %q with a non-existent image", deploymentName)) + framework.Logf("Updating deployment %q with a non-existent image", deploymentName) deployment, err = framework.UpdateDeploymentWithRetries(c, ns, d.Name, func(update *extensions.Deployment) { update.Spec.Template.Spec.Containers[0].Image = "nginx:404" }) Expect(err).NotTo(HaveOccurred()) - By(fmt.Sprintf("Waiting for observed generation %d", deployment.Generation)) + framework.Logf("Waiting for observed generation %d", deployment.Generation) err = framework.WaitForObservedDeployment(c, ns, deploymentName, deployment.Generation) Expect(err).NotTo(HaveOccurred()) @@ -1069,7 +1045,7 @@ func testScaledRolloutDeployment(f *framework.Framework) { Expect(fmt.Errorf("Observed %d available replicas, less than min required %d", deployment.Status.AvailableReplicas, deploymentutil.MinAvailable(deployment))).NotTo(HaveOccurred()) } - By(fmt.Sprintf("Checking that the replica sets for %q are synced", deploymentName)) + framework.Logf("Checking that the replica sets for %q are synced", deploymentName) oldRs, err := c.Extensions().ReplicaSets(rs.Namespace).Get(rs.Name, metav1.GetOptions{}) Expect(err).NotTo(HaveOccurred()) @@ -1084,7 +1060,7 @@ func testScaledRolloutDeployment(f *framework.Framework) { err = wait.PollImmediate(10*time.Millisecond, 1*time.Minute, newCond) Expect(err).NotTo(HaveOccurred()) - By(fmt.Sprintf("Updating the size (down) and template at the same time for deployment %q", deploymentName)) + framework.Logf("Updating the size (down) and template at the same time for deployment %q", deploymentName) newReplicas = int32(5) deployment, err = framework.UpdateDeploymentWithRetries(c, ns, deployment.Name, func(update *extensions.Deployment) { update.Spec.Replicas = &newReplicas @@ -1095,14 +1071,14 @@ func testScaledRolloutDeployment(f *framework.Framework) { err = framework.WaitForObservedDeployment(c, ns, deploymentName, deployment.Generation) Expect(err).NotTo(HaveOccurred()) - By(fmt.Sprintf("Waiting for deployment status to sync (current available: %d, minimum available: %d)", deployment.Status.AvailableReplicas, deploymentutil.MinAvailable(deployment))) + framework.Logf("Waiting for deployment status to sync (current available: %d, minimum available: %d)", deployment.Status.AvailableReplicas, deploymentutil.MinAvailable(deployment)) Expect(framework.WaitForDeploymentStatusValid(c, deployment)).NotTo(HaveOccurred()) oldRSs, _, rs, err = deploymentutil.GetAllReplicaSets(deployment, c) Expect(err).NotTo(HaveOccurred()) for _, rs := range append(oldRSs, rs) { - By(fmt.Sprintf("Ensuring replica set %q has the correct desiredReplicas annotation", rs.Name)) + framework.Logf("Ensuring replica set %q has the correct desiredReplicas annotation", rs.Name) desired, ok := deploymentutil.GetDesiredReplicasAnnotation(rs) if !ok || desired == *(deployment.Spec.Replicas) { continue @@ -1120,7 +1096,7 @@ func testOverlappingDeployment(f *framework.Framework) { deploymentName := "first-deployment" podLabels := map[string]string{"name": redisImageName} replicas := int32(1) - By(fmt.Sprintf("Creating deployment %q", deploymentName)) + framework.Logf("Creating deployment %q", deploymentName) d := framework.NewDeployment(deploymentName, replicas, podLabels, redisImageName, redisImage, extensions.RollingUpdateDeploymentStrategyType) deploy, err := c.Extensions().Deployments(ns).Create(d) Expect(err).NotTo(HaveOccurred(), "Failed creating the first deployment") @@ -1131,7 +1107,7 @@ func testOverlappingDeployment(f *framework.Framework) { // Create second deployment with overlapping selector. deploymentName = "second-deployment" - By(fmt.Sprintf("Creating deployment %q with overlapping selector", deploymentName)) + framework.Logf("Creating deployment %q with overlapping selector", deploymentName) podLabels["other-label"] = "random-label" d = framework.NewDeployment(deploymentName, replicas, podLabels, nginxImageName, nginxImage, extensions.RollingUpdateDeploymentStrategyType) deployOverlapping, err := c.Extensions().Deployments(ns).Create(d) @@ -1142,7 +1118,7 @@ func testOverlappingDeployment(f *framework.Framework) { Expect(err).NotTo(HaveOccurred(), "The second deployment failed to update to revision 1") // Both deployments should proceed independently. - By("Checking each deployment creates its own replica set") + framework.Logf("Checking each deployment creates its own replica set") options := metav1.ListOptions{} rsList, err := c.Extensions().ReplicaSets(ns).List(options) Expect(err).NotTo(HaveOccurred(), "Failed listing all replica sets in namespace %s", ns) @@ -1335,20 +1311,20 @@ func testDeploymentsControllerRef(f *framework.Framework) { c := f.ClientSet deploymentName := "test-orphan-deployment" - By(fmt.Sprintf("Creating Deployment %q", deploymentName)) + framework.Logf("Creating Deployment %q", deploymentName) podLabels := map[string]string{"name": nginxImageName} replicas := int32(1) d := framework.NewDeployment(deploymentName, replicas, podLabels, nginxImageName, nginxImage, extensions.RollingUpdateDeploymentStrategyType) deploy, err := c.Extensions().Deployments(ns).Create(d) Expect(err).NotTo(HaveOccurred()) - err = framework.WaitForDeploymentStatus(c, deploy) + err = framework.WaitForDeploymentStatusValid(c, deploy) Expect(err).NotTo(HaveOccurred()) - By("Checking its ReplicaSet has the right controllerRef") + framework.Logf("Checking its ReplicaSet has the right controllerRef") err = checkDeploymentReplicaSetsControllerRef(c, ns, deploy.UID, podLabels) Expect(err).NotTo(HaveOccurred()) - By(fmt.Sprintf("Deleting Deployment %q and orphaning its ReplicaSets", deploymentName)) + framework.Logf("Deleting Deployment %q and orphaning its ReplicaSets", deploymentName) err = orphanDeploymentReplicaSets(c, deploy) Expect(err).NotTo(HaveOccurred()) @@ -1357,14 +1333,14 @@ func testDeploymentsControllerRef(f *framework.Framework) { Expect(err).NotTo(HaveOccurred(), "error waiting for Deployment ReplicaSet to be orphaned") deploymentName = "test-adopt-deployment" - By(fmt.Sprintf("Creating Deployment %q to adopt the ReplicaSet", deploymentName)) + framework.Logf("Creating Deployment %q to adopt the ReplicaSet", deploymentName) d = framework.NewDeployment(deploymentName, replicas, podLabels, nginxImageName, nginxImage, extensions.RollingUpdateDeploymentStrategyType) deploy, err = c.Extensions().Deployments(ns).Create(d) Expect(err).NotTo(HaveOccurred()) - err = framework.WaitForDeploymentStatus(c, deploy) + err = framework.WaitForDeploymentStatusValid(c, deploy) Expect(err).NotTo(HaveOccurred()) - By("Waiting for the ReplicaSet to have the right controllerRef") + framework.Logf("Waiting for the ReplicaSet to have the right controllerRef") err = checkDeploymentReplicaSetsControllerRef(c, ns, deploy.UID, podLabels) Expect(err).NotTo(HaveOccurred()) }