Added a type annotation for clarity in Ultimately and added a tolerance to an UltimatelySpec test to reduce the likelihood of flicker.

Author: bvenners

scalatest-test/src/test/scala/org/scalatest/concurrent/UltimatelySpec.scala

@@ -201,7 +201,7 @@ class UltimatelySpec extends AsyncFunSpec with Matchers with OptionValues {
           } 
         } 
       } map { _ =>
-        (System.currentTimeMillis - startTime.get).toInt should be >= (1388)
+        (System.currentTimeMillis - startTime.get).toInt should be >= (1388 - 10) // - 10 to give it a little wiggle room
       }
     }
 

scalatest/src/main/scala/org/scalatest/concurrent/Ultimately.scala

@@ -26,6 +26,7 @@ import org.scalatest.exceptions.StackDepthException
 import scala.concurrent.{Future, Promise, ExecutionContext}
 import scala.util.{Success, Failure}
 import java.util.concurrent.{ Executors, TimeUnit, ThreadFactory }
+import java.util.concurrent.ScheduledExecutorService
 
 /**
  * Trait that provides the <code>ultimately</code> construct, which periodically retries executing
@@ -504,7 +505,7 @@ trait Ultimately extends PatienceConfiguration {
  * </pre>
  */
 object Ultimately extends Ultimately {
-  private lazy val scheduler = {
+  private lazy val scheduler: ScheduledExecutorService = {
     val threadFactory = new ThreadFactory {
       val inner = Executors.defaultThreadFactory()
       def newThread(runnable: Runnable) = {