diff options
| author | Henrik Nord <[email protected]> | 2015-09-30 13:26:57 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-09-30 13:26:57 +0200 |
| commit | 46178552c4622b29d5a70ca23d945e9036caa437 (patch) | |
| tree | 99075002bb3a414ebb8a8e9c637f5cd8a5d97230 | |
| parent | adad7350db249104a3012d3ea0cd6aab20a86cb6 (diff) | |
| parent | ff2025e7a31f3500182cf1b259eddf6b6e5c4e1b (diff) | |
| download | otp-46178552c4622b29d5a70ca23d945e9036caa437.tar.gz otp-46178552c4622b29d5a70ca23d945e9036caa437.tar.bz2 otp-46178552c4622b29d5a70ca23d945e9036caa437.zip | |
Merge branch 'stevendanna/eunit-doc-timeout' into maint
* stevendanna/eunit-doc-timeout:
Document eunit's default 5 second test timeout
OTP-13017
| -rw-r--r-- | lib/eunit/doc/overview.edoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/eunit/doc/overview.edoc b/lib/eunit/doc/overview.edoc index df716cdeea..2789a05792 100644 --- a/lib/eunit/doc/overview.edoc +++ b/lib/eunit/doc/overview.edoc @@ -885,7 +885,7 @@ the timeout is exceeded, the unfinished tests will be forced to terminate. Note that if a timeout is set around a fixture, it includes the time for setup and cleanup, and if the timeout is triggered, the entire fixture is abruptly terminated (without running the -cleanup).</dd> +cleanup). The default timeout for an individual test is 5 seconds.</dd> <dt>`{inorder, Tests}'</dt> <dd>Runs the specified tests in strict order. Also see `{inparallel, Tests}'. By default, tests are neither marked as `inorder' or |