diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-11-03 23:27:57 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-11-03 23:27:57 +0100 |
| commit | 59faf588080b137817444a6877170e2bd687427f (patch) | |
| tree | a5f1cadf6c21915938d435e1a9d01583475d0c6a /kamon-spray/src/test/scala/kamon/spray/TestServer.scala | |
| parent | 4b999c39b6bd09d891de718fad10b795264755c6 (diff) | |
| parent | 6e3d9ae88ecce10420eeac82294c54c1b43dedf4 (diff) | |
| download | Kamon-59faf588080b137817444a6877170e2bd687427f.tar.gz Kamon-59faf588080b137817444a6877170e2bd687427f.tar.bz2 Kamon-59faf588080b137817444a6877170e2bd687427f.zip | |
Merge branch 'master' into release-0.2, kamon-play still need fixes.
Conflicts:
kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala
kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala
kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala
kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala
kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala
kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala
kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala
project/Dependencies.scala
Diffstat (limited to 'kamon-spray/src/test/scala/kamon/spray/TestServer.scala')
| -rw-r--r-- | kamon-spray/src/test/scala/kamon/spray/TestServer.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kamon-spray/src/test/scala/kamon/spray/TestServer.scala b/kamon-spray/src/test/scala/kamon/spray/TestServer.scala index 65506770..379b8fc8 100644 --- a/kamon-spray/src/test/scala/kamon/spray/TestServer.scala +++ b/kamon-spray/src/test/scala/kamon/spray/TestServer.scala @@ -45,13 +45,13 @@ trait TestServer { probe.sender } - def buildSHostConnectorAndServer: (ActorRef, TestProbe) = { + def buildSHostConnectorAndServer: (ActorRef, TestProbe, Http.Bound) = { val serverHandler = TestProbe() IO(Http).tell(Http.Bind(listener = serverHandler.ref, interface = "127.0.0.1", port = 0), serverHandler.ref) val bound = serverHandler.expectMsgType[Bound](10 seconds) val client = httpHostConnector(bound) - (client, serverHandler) + (client, serverHandler, bound) } private def httpHostConnector(connectionInfo: Http.Bound): ActorRef = { |