Merge pull request #35892 from kargakis/fix-test-panic

Automatic merge from submit-queue test: check for desired Deployment status prior to listing RSs Fixes the panic in https://github.com/kubernetes/kubernetes/issues/35337 @mfojtik

Merge pull request #35892 from kargakis/fix-test-panic
35bdb1ee · Kubernetes Submit Queue · GitHub · a52ad987 · a96fa848 · 35bdb1ee
Commit 35bdb1ee authored Oct 31, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 31, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 8 deletions

deployment.go test/e2e/deployment.go +6 -8

No files found.
--- a/test/e2e/deployment.go
+++ b/test/e2e/deployment.go
@@ -1136,6 +1136,9 @@ 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)))
+	Expect(framework.WaitForDeploymentStatusValid(c, deployment)).NotTo(HaveOccurred())
+
 	oldRSs, _, rs, err := deploymentutil.GetAllReplicaSets(deployment, c)
 	Expect(err).NotTo(HaveOccurred())

@@ -1149,10 +1152,6 @@ func testScaledRolloutDeployment(f *framework.Framework) {
 		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)))
-	err = framework.WaitForDeploymentStatusValid(c, deployment)
-	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))
 	deployment, err = framework.UpdateDeploymentWithRetries(c, ns, d.Name, func(update *extensions.Deployment) {
@@ -1197,6 +1196,9 @@ 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)))
+	Expect(framework.WaitForDeploymentStatusValid(c, deployment)).NotTo(HaveOccurred())
+
 	oldRSs, _, rs, err = deploymentutil.GetAllReplicaSets(deployment, c)
 	Expect(err).NotTo(HaveOccurred())

@@ -1209,10 +1211,6 @@ func testScaledRolloutDeployment(f *framework.Framework) {
 		err = fmt.Errorf("unexpected desiredReplicas annotation %d for replica set %q", desired, rs.Name)
 		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)))
-	err = framework.WaitForDeploymentStatusValid(c, deployment)
-	Expect(err).NotTo(HaveOccurred())
 }

 func testOverlappingDeployment(f *framework.Framework) {