From: R David Murray <rdmurray@bitdance.com>
Date: Thu, 2 Jan 2014 18:43:02 +0000 (-0500)
Subject: Merge and update #17282: Document unittest.main defaultTest argument.
X-Git-Tag: v3.4.0b2~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e731b0a418784eba9065cddc2b0f665faff051c;p=python

Merge and update #17282: Document unittest.main defaultTest argument.

In 3.4 defaultTest can also be a list (see issue 15132).
---

6e731b0a418784eba9065cddc2b0f665faff051c
diff --cc Doc/library/unittest.rst
index 46d303ab63,fcfd514d01..3f3012722a
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@@ -1966,6 -1801,10 +1966,11 @@@ Loading and running test
        if __name__ == '__main__':
            unittest.main(verbosity=2)
  
 -   The *defaultTest* argument is the name of the test to run if no test names
 -   are specified via *argv*.  If not specified or ``None`` and no test names are
 -   provided via *argv*, all tests found in *module* are run.
++   The *defaultTest* argument is either the name of a single test or an
++   iterable of test names to run if no test names are specified via *argv*.  If
++   not specified or ``None`` and no test names are provided via *argv*, all
++   tests found in *module* are run.
+ 
     The *argv* argument can be a list of options passed to the program, with the
     first element being the program name.  If not specified or ``None``,
     the values of :data:`sys.argv` are used.