Skip to content

Commit

Permalink
Merge pull request #12783 from ramr/bugfix
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot authored Feb 3, 2017
2 parents 97275c6 + 0ed96c6 commit 0698513
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions test/integration/router_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -369,9 +369,7 @@ func TestRouter(t *testing.T) {

//clean up
routeEvent.Type = watch.Deleted
endpointEvent.Type = watch.Modified
endpoints := endpointEvent.Object.(*kapi.Endpoints)
endpoints.Subsets = []kapi.EndpointSubset{}
endpointEvent.Type = watch.Deleted

sendTimeout(t, fakeMasterAndPod.EndpointChannel, eventString(endpointEvent), 30*time.Second)
sendTimeout(t, fakeMasterAndPod.RouteChannel, eventString(routeEvent), 30*time.Second)
Expand Down

0 comments on commit 0698513

Please sign in to comment.