From 185771c91d38c6f8f3481d6d723693d69325fc31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= Date: Mon, 25 Feb 2013 13:50:11 +0100 Subject: [PATCH] Removed blocking code from TcpConnectionSpec #3064 --- .../test/scala/akka/io/TcpConnectionSpec.scala | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala b/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala index b2eec02416..38a3a5d1fe 100644 --- a/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala @@ -98,9 +98,12 @@ class TcpConnectionSpec extends AkkaSpec("akka.io.tcp.register-timeout = 500ms") "receive data directly when the connection is established" in withUnacceptedConnection() { unregisteredSetup ⇒ import unregisteredSetup._ - localServer.configureBlocking(true) - val serverSideChannel = localServer.accept() - serverSideChannel must not be (null) + @volatile var serverSideChannel: SocketChannel = null + awaitCond { + serverSideChannel = localServer.accept() + serverSideChannel != null + } + serverSideChannel.write(ByteBuffer.wrap("immediatedata".getBytes("ASCII"))) serverSideChannel.configureBlocking(false) @@ -662,8 +665,11 @@ class TcpConnectionSpec extends AkkaSpec("akka.io.tcp.register-timeout = 500ms") clientSocketOptions: immutable.Seq[SocketOption] = Nil)(body: RegisteredSetup ⇒ Any): Unit = withUnacceptedConnection(setServerSocketOptions, createConnectionActor(options = clientSocketOptions)) { unregisteredSetup ⇒ import unregisteredSetup._ - localServer.configureBlocking(true) - val serverSideChannel = localServer.accept() + @volatile var serverSideChannel: SocketChannel = null + awaitCond { + serverSideChannel = localServer.accept() + serverSideChannel != null + } serverSideChannel.configureBlocking(false) serverSideChannel must not be (null)