Merge pull request #22695 from akka/documentAwaitAssert

Clarify awaitAssert scaladoc
This commit is contained in:
Martynas Mickevičius 2017-04-11 11:46:58 +03:00 committed by GitHub
commit 129069c435
2 changed files with 4 additions and 6 deletions

View file

@ -283,9 +283,8 @@ trait TestKitBase {
}
/**
* Await until the given assert does not throw an exception or the timeout
* expires, whichever comes first. If the timeout expires the last exception
* is thrown.
* Evaluate the given assert every `interval` until it does not throw an exception.
* If the `max` timeout expires the last exception is thrown.
*
* If no timeout is given, take it from the innermost enclosing `within`
* block.

View file

@ -195,9 +195,8 @@ class TestKit(system: ActorSystem) {
def awaitAssert(max: Duration, a: Supplier[Any]): Unit = tp.awaitAssert(a.get, max)
/**
* Await until the given assert does not throw an exception or the timeout
* expires, whichever comes first. If the timeout expires the last exception
* is thrown.
* Evaluate the given assert every `interval` until it does not throw an exception.
* If the `max` timeout expires the last exception is thrown.
*
* Note that the timeout is scaled using Duration.dilated,
* which uses the configuration entry "akka.test.timefactor".