summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/tests/test_install.py
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-02-02 21:38:37 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-02-02 21:38:37 (GMT)
commitb344dd06c85e5961d5ce99fe9bfd1de10ae66440 (patch)
treefbdf50499b0ce9be7c726bf49203c2444c044e5c /Lib/distutils/tests/test_install.py
parent65548873cfdef1fbd99a71e84a81283558342d64 (diff)
downloadcpython-b344dd06c85e5961d5ce99fe9bfd1de10ae66440.zip
cpython-b344dd06c85e5961d5ce99fe9bfd1de10ae66440.tar.gz
cpython-b344dd06c85e5961d5ce99fe9bfd1de10ae66440.tar.bz2
Merged revisions 86236,86240,86332,86340,87271,87273,87447 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k The missing NEWS entries correspond to changes that were made before 3.1.3, but I think it’s not usual to edit entries of released versions, so I put them at the top. ........ r86236 | eric.araujo | 2010-11-06 03:44:43 +0100 (sam., 06 nov. 2010) | 2 lines Make sure each test can be run standalone (./python Lib/distutils/tests/x.py) ........ r86240 | eric.araujo | 2010-11-06 05:11:59 +0100 (sam., 06 nov. 2010) | 2 lines Prevent ResourceWarnings in test_gettext ........ r86332 | eric.araujo | 2010-11-08 19:15:17 +0100 (lun., 08 nov. 2010) | 4 lines Add missing NEWS entry for a fix committed by Senthil. All recent modifications to distutils should now be covered in NEWS. ........ r86340 | eric.araujo | 2010-11-08 22:48:23 +0100 (lun., 08 nov. 2010) | 2 lines This was actually fixed for the previous alpha. ........ r87271 | eric.araujo | 2010-12-15 20:09:58 +0100 (mer., 15 déc. 2010) | 2 lines Improve trace documentation (#9264). Patch by Eli Bendersky. ........ r87273 | eric.araujo | 2010-12-15 20:30:15 +0100 (mer., 15 déc. 2010) | 2 lines Use nested method directives, rewrap long lines, fix whitespace. ........ r87447 | eric.araujo | 2010-12-23 20:13:05 +0100 (jeu., 23 déc. 2010) | 2 lines Fix typo in superclass method name ........
Diffstat (limited to 'Lib/distutils/tests/test_install.py')
-rw-r--r--Lib/distutils/tests/test_install.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py
index f9c142e..a76e3e7 100644
--- a/Lib/distutils/tests/test_install.py
+++ b/Lib/distutils/tests/test_install.py
@@ -6,7 +6,7 @@ import sys
import unittest
import site
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
from distutils.command.install import install
from distutils.command import install as install_module
@@ -203,4 +203,4 @@ def test_suite():
return unittest.makeSuite(InstallTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())