summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-10-27 11:05:02 -0700
committerSenthil Kumaran <senthil@uthcode.com>2012-10-27 11:05:02 -0700
commitbc876a2d4a7b8aa9aedd5da6b62fe391092c3b3c (patch)
tree10860d3afc58642aefc93420b51f06398c39ebbb
parentf9333026f7d06986bdfe9a070250726b97f896fb (diff)
parent847c33cc3ba4fcbda0b726391388d4d86a50b9e3 (diff)
downloadcpython-git-bc876a2d4a7b8aa9aedd5da6b62fe391092c3b3c.tar.gz
Automated merge with file:///home/vagrant/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 72a3a7b51a..4422533d02 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: