[Python-checkins] cpython (merge 3.2 -> 3.3): merge from 3.2

senthil.kumaran python-checkins at python.org
Sat Oct 27 20:06:02 CEST 2012


http://hg.python.org/cpython/rev/7e936687fe87
changeset:   79969:7e936687fe87
branch:      3.3
parent:      79964:6f064689b8c0
parent:      79968:5b1331857cbf
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sat Oct 27 11:05:32 2012 -0700
summary:
  merge from 3.2

files:
  Doc/library/unittest.rst |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -99,9 +99,10 @@
 
    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:

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list