raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Merge pull request #1281 from spray/master

Browse source 
Smaller improvements to TCP side of new akka-io implementation
This commit is contained in:
Roland Kuhn 2013-04-04 02:47:35 -07:00
commit 22968a3ab8
6 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala
View file

@ -5,7 +5,7 @@
package akka.io
import java.io.IOException
import java.net.{ Socket, ConnectException, InetSocketAddress, SocketException }
import java.net.{ ConnectException, InetSocketAddress, SocketException }
import java.nio.ByteBuffer
import java.nio.channels.{ SelectionKey, Selector, ServerSocketChannel, SocketChannel }
import java.nio.channels.spi.SelectorProvider
@ -176,6 +176,7 @@ class TcpConnectionSpec extends AkkaSpec("akka.io.tcp.register-timeout = 500ms")
buffer.flip()
ByteString(buffer).take(10).decodeString("ASCII") must be("morestuff!")
}
"write data after not acknowledged data" in withEstablishedConnection() { setup ⇒
import setup._
@ -405,6 +406,7 @@ class TcpConnectionSpec extends AkkaSpec("akka.io.tcp.register-timeout = 500ms")
assertThisConnectionActorTerminated()
}
"report when peer closed the connection when trying to write" in withEstablishedConnection() { setup ⇒
import setup._
@ -432,8 +434,7 @@ class TcpConnectionSpec extends AkkaSpec("akka.io.tcp.register-timeout = 500ms")
EventFilter[SocketException](occurrences = 1) intercept {
selector.send(connectionActor, ChannelConnectable)
val err = userHandler.expectMsgType[ErrorClosed]
err.cause must be(ConnectionResetByPeerMessage)
userHandler.expectMsg(CommandFailed(Connect(serverAddress)))
}
verifyActorTermination(connectionActor)
@ -453,8 +454,7 @@ class TcpConnectionSpec extends AkkaSpec("akka.io.tcp.register-timeout = 500ms")
key.isConnectable must be(true)
EventFilter[ConnectException](occurrences = 1) intercept {
selector.send(connectionActor, ChannelConnectable)
val err = userHandler.expectMsgType[ErrorClosed]
err.cause.startsWith(ConnectionRefusedMessagePrefix) must be(true)
userHandler.expectMsg(CommandFailed(Connect(UnboundAddress)))
}
verifyActorTermination(connectionActor)