merge from 3.2

This commit is contained in:
Senthil Kumaran 2012-10-27 11:05:32 -07:00
commit 0b3014dda0

View File

@ -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: