From: Ezio Melotti Date: Wed, 27 Mar 2013 18:13:59 +0000 (+0200) Subject: #17329: merge with 3.3. X-Git-Tag: v3.4.0a1~1082 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67ddccafc39c49b53bf1166c6fda603406d59640;p=python #17329: merge with 3.3. --- 67ddccafc39c49b53bf1166c6fda603406d59640 diff --cc Doc/library/unittest.rst index 92dd8dc3b7,c44ab23b31..766122b0c5 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@@ -1570,9 -1500,7 +1577,9 @@@ Loading and running test directory must be specified separately. If importing a module fails, for example due to a syntax error, then this - will be recorded as a single error and discovery will continue. + will be recorded as a single error and discovery will continue. If the - import failure is due to ``SkipTest`` being raised, it will be recorded ++ import failure is due to :exc:`SkipTest` being raised, it will be recorded + as a skip instead of an error. If a test package name (directory with :file:`__init__.py`) matches the pattern then the package will be checked for a ``load_tests`` @@@ -1591,15 -1519,6 +1598,15 @@@ .. versionadded:: 3.2 + .. versionchanged:: 3.4 - Modules that raise ``SkipTest`` on import are recorded as skips, not - errors. ++ Modules that raise :exc:`SkipTest` on import are recorded as skips, ++ not errors. + + .. versionchanged:: 3.4 + Paths are sorted before being imported to ensure execution order for a + given test suite is the same even if the underlying file system's ordering + is not dependent on file name like in ext3/4. + The following attributes of a :class:`TestLoader` can be configured either by subclassing or assignment on an instance: