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

Fixed race between async close() and ChannelReadable message in tests #3055

Browse source
This commit is contained in:
Endre Sándor Varga 2013-02-28 14:48:28 +01:00
parent d8a577d969
commit f8d178502e
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -322,7 +322,8 @@ class TcpConnectionSpec extends AkkaSpec("akka.io.tcp.register-timeout = 500ms")
val buffer = ByteBuffer.allocate(1)
serverSelectionKey must be(selectedAs(SelectionKey.OP_READ, 2.seconds))
serverSideChannel.read(buffer) must be(-1)
serverSideChannel.close()
closeServerSideAndWaitForClientReadable()
selector.send(connectionActor, ChannelReadable)
connectionHandler.expectMsg(ConfirmedClosed)
@ -354,7 +355,8 @@ class TcpConnectionSpec extends AkkaSpec("akka.io.tcp.register-timeout = 500ms")
val buffer = ByteBuffer.allocate(1)
serverSelectionKey must be(selectedAs(SelectionKey.OP_READ, 2.seconds))
serverSideChannel.read(buffer) must be(-1)
serverSideChannel.close()
closeServerSideAndWaitForClientReadable()
selector.send(connectionActor, ChannelReadable)
connectionHandler.expectMsg(ConfirmedClosed)
@ -365,7 +367,8 @@ class TcpConnectionSpec extends AkkaSpec("akka.io.tcp.register-timeout = 500ms")
"report when peer closed the connection" in withEstablishedConnection() { setup ⇒
import setup._
serverSideChannel.close()
closeServerSideAndWaitForClientReadable()
selector.send(connectionActor, ChannelReadable)
connectionHandler.expectMsg(PeerClosed)
@ -540,6 +543,11 @@ class TcpConnectionSpec extends AkkaSpec("akka.io.tcp.register-timeout = 500ms")
val clientSelectionKey = registerChannel(clientSideChannel, "client")
val serverSelectionKey = registerChannel(serverSideChannel, "server")
def closeServerSideAndWaitForClientReadable(): Unit = {
serverSideChannel.close()
checkFor(clientSelectionKey, SelectionKey.OP_READ, 3.seconds.toMillis.toInt) must be(true)
}
def registerChannel(channel: SocketChannel, name: String): SelectionKey = {
val res = channel.register(nioSelector, 0)
res.attach(name)