summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-10-27 18:05:54 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-10-27 18:05:54 (GMT)
commit450371305fd40d35beff7aa812daed9abe38dedd (patch)
treee9833ef0c76fd8b2a37d3fdbecd25c383cb5ad22
parent9617ce99a9a36ee8e94d6347194e054fa82c9e45 (diff)
parent0b3014dda01b6ed3fc805cbfce37a9dc6f0d0fa1 (diff)
downloadcpython-450371305fd40d35beff7aa812daed9abe38dedd.zip
cpython-450371305fd40d35beff7aa812daed9abe38dedd.tar.gz
cpython-450371305fd40d35beff7aa812daed9abe38dedd.tar.bz2
merge from 3.3
-rw-r--r--Doc/library/unittest.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 2657ebd..06f3d83 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -99,9 +99,10 @@ need to derive from a specific class.
The script :file:`Tools/unittestgui/unittestgui.py` in the Python source distribution is
a GUI tool for test discovery and execution. This is intended largely for ease of use
- for those new to unit testing. For production environments it is recommended that
- tests be driven by a continuous integration system such as `Hudson <http://hudson-ci.org/>`_
- or `Buildbot <http://buildbot.net/trac>`_.
+ for those new to unit testing. For production environments it is
+ recommended that tests be driven by a continuous integration system such as
+ `Buildbot <http://buildbot.net/trac>`_, `Jenkins <http://jenkins-ci.org>`_
+ or `Hudson <http://hudson-ci.org/>`_.
.. _unittest-minimal-example: