summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorMartin Pool <mbp@canonical.com>2011-11-29 13:21:58 +1100
committerMartin Pool <mbp@canonical.com>2011-11-29 13:21:58 +1100
commit2b1fba6a3e920d0e2e87551defaed08025dc112c (patch)
tree025c663825dfc5cda89315b1b147748cdf811594 /README
parent05e00d8d1b3d0a6e0ddc2153d9552f7823223ae9 (diff)
downloadfixtures-2b1fba6a3e920d0e2e87551defaed08025dc112c.tar.gz
Rename to just TimeoutException, and remove more connections to Timeout only being used in tests
Diffstat (limited to 'README')
-rw-r--r--README6
1 files changed, 3 insertions, 3 deletions
diff --git a/README b/README
index cd02c99..4303e16 100644
--- a/README
+++ b/README
@@ -343,9 +343,9 @@ Aborts if the covered code takes more than a specified number of whole wall-cloc
seconds.
There are two possibilities, controlled by the 'gentle' argument: when gentle,
-an exception will be raised and the test will fail. When not gentle, the
-entire test process will be terminated, which is less clean, but more likely to
-break hangs where no Python code is running.
+an exception will be raised and the test (or other covered code) will fail.
+When not gentle, the entire process will be terminated, which is less clean,
+but more likely to break hangs where no Python code is running.
*Caution:* Only one timeout can be active at any time across all threads in a
single process. Using more than one has undefined results. (This could be