Fix TestWaitForRunningDeploymentSuccess race

tnozicka · tnozicka · commit f6f37ad8c4ec · 2017-11-29T15:09:42.000+01:00
diff --git a/pkg/apps/registry/rest_test.go b/pkg/apps/registry/rest_test.go
@@ -18,6 +18,7 @@ func TestWaitForRunningDeploymentSuccess(t *testing.T) {
 	fakeController := &kapi.ReplicationController{}
 	fakeController.Name = "test-1"
 	fakeController.Namespace = "test"
+	fakeController.Annotations = map[string]string{deployapi.DeploymentStatusAnnotation: string(deployapi.DeploymentStatusRunning)}
 
 	kubeclient := fake.NewSimpleClientset([]runtime.Object{fakeController}...)
 	fakeWatch := watch.NewFake()
@@ -38,7 +39,6 @@ func TestWaitForRunningDeploymentSuccess(t *testing.T) {
 		}
 	}()
 
-	fakeController.Annotations = map[string]string{deployapi.DeploymentStatusAnnotation: string(deployapi.DeploymentStatusRunning)}
 	fakeWatch.Modify(fakeController)
 	<-stopChan
 }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ func TestWaitForRunningDeploymentSuccess(t *testing.T) {`
`18`	`18`	`fakeController := &kapi.ReplicationController{}`
`19`	`19`	`fakeController.Name = "test-1"`
`20`	`20`	`fakeController.Namespace = "test"`
	`21`	`+ fakeController.Annotations = map[string]string{deployapi.DeploymentStatusAnnotation: string(deployapi.DeploymentStatusRunning)}`
`21`	`22`
`22`	`23`	`kubeclient := fake.NewSimpleClientset([]runtime.Object{fakeController}...)`
`23`	`24`	`fakeWatch := watch.NewFake()`
`@@ -38,7 +39,6 @@ func TestWaitForRunningDeploymentSuccess(t *testing.T) {`
`38`	`39`	`}`
`39`	`40`	`}()`
`40`	`41`
`41`		`- fakeController.Annotations = map[string]string{deployapi.DeploymentStatusAnnotation: string(deployapi.DeploymentStatusRunning)}`
`42`	`42`	`fakeWatch.Modify(fakeController)`
`43`	`43`	`<-stopChan`
`44`	`44`	`}`