Merge pull request #362 from mattrjacobs/fix-rxnetty-metrics-stream-u…

…nit-tests s/toBlockingObservable/toBlocking in hystrix-rxnetty-metrics-stream
Netflix · Dec 15, 2014 · 3a41292 · 3a41292
2 parents f2765eb + 5029a56
commit 3a41292
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...va/com/netflix/hystrix/contrib/rxnetty/metricsstream/HystrixMetricsStreamHandlerTest.java b/...va/com/netflix/hystrix/contrib/rxnetty/metricsstream/HystrixMetricsStreamHandlerTest.java
@@ -85,7 +85,7 @@ public Observable<? extends ServerSentEvent> call(HttpClientResponse<ServerSentE
  }
  });
 
- Object first = Observable.amb(objectObservable, Observable.timer(1000, TimeUnit.MILLISECONDS)).toBlockingObservable().first();
+ Object first = Observable.amb(objectObservable, Observable.timer(1000, TimeUnit.MILLISECONDS)).toBlocking().first();
 
  assertTrue("Expected SSE message", first instanceof ServerSentEvent);
  ServerSentEvent sse = (ServerSentEvent) first;
@@ -116,4 +116,4 @@ public Observable<Void> handle(HttpServerRequest<ByteBuf> request, HttpServerRes
  }
  throw new RuntimeException("Cannot initialize RxNetty server", error);
  }
-}
+}