Skip to content

Automated cherry-pick of #17492 on release-3.7 #17599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Jan 6, 2018
Merged

Automated cherry-pick of #17492 on release-3.7 #17599

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba7e3e4
Fix DC reaper to deal with invalid resource name. (It was deleting al…
tnozicka Nov 28, 2017
7eb3628
Fix TestWaitForRunningDeploymentSuccess race
tnozicka Nov 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix TestWaitForRunningDeploymentSuccess race
  • Loading branch information
@tnozicka
tnozicka authored and cherrypicker committed Dec 5, 2017
commit 7eb3628de136de2816cb0d7f26150d003ed8359d
2 changes: 1 addition & 1 deletion pkg/apps/registry/rest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -38,7 +39,6 @@ func TestWaitForRunningDeploymentSuccess(t *testing.T) {
}
}()

fakeController.Annotations = map[string]string{deployapi.DeploymentStatusAnnotation: string(deployapi.DeploymentStatusRunning)}
fakeWatch.Modify(fakeController)
<-stopChan
}
Expand Down