summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2011-09-19 10:26:31 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2011-09-19 10:26:31 (GMT)
commit2496f331a75c9dd30ef8588ae86179131227163a (patch)
tree90dd7c0d28d2a0196a9a2c60f097ea32b65aaba4 /Doc
parentb1e5d595afd15d3b84600883a5b60d1fbc6882e6 (diff)
downloadcpython-2496f331a75c9dd30ef8588ae86179131227163a.zip
cpython-2496f331a75c9dd30ef8588ae86179131227163a.tar.gz
cpython-2496f331a75c9dd30ef8588ae86179131227163a.tar.bz2
Close issue 12958 by flagging expected failures in test_socket on Mac OS X
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/test.rst11
1 files changed, 9 insertions, 2 deletions
diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index be5990c..5e4a1cb 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -399,12 +399,19 @@ The :mod:`test.support` module defines the following functions:
otherwise.
-.. function:: skip_unless_symlink()
+.. decorator:: skip_unless_symlink()
A decorator for running tests that require support for symbolic links.
-.. function:: run_with_locale(catstr, *locales)
+.. decorator:: anticipate_failure(condition)
+
+ A decorator to conditionally mark tests with
+ :func:`unittest.expectedFailure`. Any use of this decorator should
+ have an associated comment identifying the relevant tracker issue.
+
+
+.. decorator:: run_with_locale(catstr, *locales)
A decorator for running a function in a different locale, correctly
resetting it after it has finished. *catstr* is the locale category as