aboutsummaryrefslogtreecommitdiffstats
path: root/lib/eunit/doc/overview.edoc
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-09-30 13:27:30 +0200
committerHenrik Nord <[email protected]>2015-09-30 13:27:30 +0200
commit382b1fde9f28090a41344d4e66bdbd5a1f4a7327 (patch)
treed70220446cd0b2337e6f6976ae2c36355f836230 /lib/eunit/doc/overview.edoc
parent93b506afd35cc9edeebbad5da0c1624e2d3c0d92 (diff)
parent46178552c4622b29d5a70ca23d945e9036caa437 (diff)
downloadotp-382b1fde9f28090a41344d4e66bdbd5a1f4a7327.tar.gz
otp-382b1fde9f28090a41344d4e66bdbd5a1f4a7327.tar.bz2
otp-382b1fde9f28090a41344d4e66bdbd5a1f4a7327.zip
Merge branch 'maint'
Diffstat (limited to 'lib/eunit/doc/overview.edoc')
-rw-r--r--lib/eunit/doc/overview.edoc2
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