summaryrefslogtreecommitdiff
path: root/clientserver/test
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-24 10:39:20 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-24 17:13:03 -0800
commite76a4eda93e96e6817ab4f337f567fd325efe545 (patch)
tree76067854dc43facac259df017baf35de2aed221e /clientserver/test
parentc98408adf2d96928fe227a740631a8efd8e0c339 (diff)
downloadmill-e76a4eda93e96e6817ab4f337f567fd325efe545.tar.gz
mill-e76a4eda93e96e6817ab4f337f567fd325efe545.tar.bz2
mill-e76a4eda93e96e6817ab4f337f567fd325efe545.zip
.
wip
Diffstat (limited to 'clientserver/test')
-rw-r--r--clientserver/test/src/mill/clientserver/ClientServerTests.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/clientserver/test/src/mill/clientserver/ClientServerTests.scala b/clientserver/test/src/mill/clientserver/ClientServerTests.scala
index ecf09ab3..55453c4f 100644
--- a/clientserver/test/src/mill/clientserver/ClientServerTests.scala
+++ b/clientserver/test/src/mill/clientserver/ClientServerTests.scala
@@ -46,7 +46,7 @@ object ClientServerTests extends TestSuite{
tmpDir.toString,
new EchoServer(),
() => (),
- () => currentTimeMillis,
+ 1000,
locks
).run()).start()
}
@@ -55,6 +55,7 @@ object ClientServerTests extends TestSuite{
def runClient(arg: String) = {
val (in, out, err) = initStreams()
locks.clientLock.lockBlock{
+ println("Client Lock")
val c = new Client(
tmpDir.toString,
() => spawnEchoServer(),
@@ -64,6 +65,7 @@ object ClientServerTests extends TestSuite{
err
)
c.run(Array(arg))
+ println("Client unlock")
(new String(out.toByteArray), new String(err.toByteArray))
}
}
@@ -99,6 +101,7 @@ object ClientServerTests extends TestSuite{
)
// Make sure the server times out of not used for a while
+ println("Sleep 2000")
currentTimeMillis += 60001
Thread.sleep(2000)
assert(