luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5286 from eatkins/server-spec-feedback 

Improve ServerSpec feedback
This commit is contained in:
eugene yokota 2019-12-10 15:20:47 -05:00 committed by GitHub
parent 0d1d8a790c 2049ce3632
commit f3638817db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbt/src/test/scala/testpkg/ServerSpec.scala
View File

@ -166,7 +166,7 @@ object TestServer {
val init = val init =
Try { Try {
testServer.waitForString(30.seconds) { s => testServer.waitForString(30.seconds) { s =>
println(s) if (s.nonEmpty) println(s)
s contains """"message":"Done"""" s contains """"message":"Done""""
} }
} }
@ -292,7 +292,7 @@ case class TestServer(baseDirectory: File) {
val deadline = duration.fromNow val deadline = duration.fromNow
@tailrec @tailrec
def impl(): Boolean = { def impl(): Boolean = {
if (deadline.isOverdue) false if (deadline.isOverdue || !process.isAlive) false
else readFrame.fold(false)(f) || impl else readFrame.fold(false)(f) || impl
} }
impl() impl()