Sat Nov 6 03:44:43 CET 2010

Author: eric.araujo
Date: Sat Nov 6 03:44:43 2010
New Revision: 86236
Log:
Make sure each test can be run standalone (./python Lib/distutils/tests/x.py)
Modified:
 python/branches/py3k/Lib/distutils/tests/__init__.py
 python/branches/py3k/Lib/distutils/tests/test_archive_util.py
 python/branches/py3k/Lib/distutils/tests/test_bdist.py
 python/branches/py3k/Lib/distutils/tests/test_bdist_dumb.py
 python/branches/py3k/Lib/distutils/tests/test_bdist_msi.py
 python/branches/py3k/Lib/distutils/tests/test_bdist_rpm.py
 python/branches/py3k/Lib/distutils/tests/test_bdist_wininst.py
 python/branches/py3k/Lib/distutils/tests/test_build.py
 python/branches/py3k/Lib/distutils/tests/test_build_clib.py
 python/branches/py3k/Lib/distutils/tests/test_build_ext.py
 python/branches/py3k/Lib/distutils/tests/test_build_py.py
 python/branches/py3k/Lib/distutils/tests/test_build_scripts.py
 python/branches/py3k/Lib/distutils/tests/test_check.py
 python/branches/py3k/Lib/distutils/tests/test_clean.py
 python/branches/py3k/Lib/distutils/tests/test_cmd.py
 python/branches/py3k/Lib/distutils/tests/test_config.py
 python/branches/py3k/Lib/distutils/tests/test_config_cmd.py
 python/branches/py3k/Lib/distutils/tests/test_core.py
 python/branches/py3k/Lib/distutils/tests/test_cygwinccompiler.py
 python/branches/py3k/Lib/distutils/tests/test_dep_util.py
 python/branches/py3k/Lib/distutils/tests/test_dir_util.py
 python/branches/py3k/Lib/distutils/tests/test_dist.py
 python/branches/py3k/Lib/distutils/tests/test_extension.py
 python/branches/py3k/Lib/distutils/tests/test_file_util.py
 python/branches/py3k/Lib/distutils/tests/test_filelist.py
 python/branches/py3k/Lib/distutils/tests/test_install.py
 python/branches/py3k/Lib/distutils/tests/test_install_data.py
 python/branches/py3k/Lib/distutils/tests/test_install_headers.py
 python/branches/py3k/Lib/distutils/tests/test_install_lib.py
 python/branches/py3k/Lib/distutils/tests/test_install_scripts.py
 python/branches/py3k/Lib/distutils/tests/test_log.py
 python/branches/py3k/Lib/distutils/tests/test_msvc9compiler.py
 python/branches/py3k/Lib/distutils/tests/test_register.py
 python/branches/py3k/Lib/distutils/tests/test_sdist.py
 python/branches/py3k/Lib/distutils/tests/test_spawn.py
 python/branches/py3k/Lib/distutils/tests/test_text_file.py
 python/branches/py3k/Lib/distutils/tests/test_unixccompiler.py
 python/branches/py3k/Lib/distutils/tests/test_upload.py
 python/branches/py3k/Lib/distutils/tests/test_util.py
 python/branches/py3k/Lib/distutils/tests/test_version.py
 python/branches/py3k/Lib/distutils/tests/test_versionpredicate.py
Modified: python/branches/py3k/Lib/distutils/tests/__init__.py
==============================================================================

--- python/branches/py3k/Lib/distutils/tests/__init__.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/__init__.py	Sat Nov 6 03:44:43 2010
@@ -15,9 +15,10 @@
 import os
 import sys
 import unittest
+from test.support import run_unittest
 
 
-here = os.path.dirname(__file__)
+here = os.path.dirname(__file__) or os.curdir
 
 
 def test_suite():
@@ -32,4 +33,4 @@
 
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_archive_util.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_archive_util.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_archive_util.py	Sat Nov 6 03:44:43 2010
@@ -12,7 +12,7 @@
 ARCHIVE_FORMATS)
 from distutils.spawn import find_executable, spawn
 from distutils.tests import support
-from test.support import check_warnings
+from test.support import check_warnings, run_unittest
 
 try:
 import zipfile
@@ -211,4 +211,4 @@
 return unittest.makeSuite(ArchiveUtilTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_bdist.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_bdist.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_bdist.py	Sat Nov 6 03:44:43 2010
@@ -4,6 +4,7 @@
 import os
 import tempfile
 import shutil
+from test.support import run_unittest
 
 from distutils.core import Distribution
 from distutils.command.bdist import bdist
@@ -40,4 +41,4 @@
 return unittest.makeSuite(BuildTestCase)
 
 if __name__ == '__main__':
- test_support.run_unittest(test_suite())
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_bdist_dumb.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_bdist_dumb.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_bdist_dumb.py	Sat Nov 6 03:44:43 2010
@@ -3,6 +3,7 @@
 import unittest
 import sys
 import os
+from test.support import run_unittest
 
 from distutils.core import Distribution
 from distutils.command.bdist_dumb import bdist_dumb
@@ -77,4 +78,4 @@
 return unittest.makeSuite(BuildDumbTestCase)
 
 if __name__ == '__main__':
- test_support.run_unittest(test_suite())
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_bdist_msi.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_bdist_msi.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_bdist_msi.py	Sat Nov 6 03:44:43 2010
@@ -11,7 +11,7 @@
 support.LoggingSilencer,
 unittest.TestCase):
 
- def test_minial(self):
+ def test_minimal(self):
 # minimal test XXX need more tests
 from distutils.command.bdist_msi import bdist_msi
 pkg_pth, dist = self.create_dist()
Modified: python/branches/py3k/Lib/distutils/tests/test_bdist_rpm.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_bdist_rpm.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_bdist_rpm.py	Sat Nov 6 03:44:43 2010
@@ -5,6 +5,7 @@
 import os
 import tempfile
 import shutil
+from test.support import run_unittest
 
 from distutils.core import Distribution
 from distutils.command.bdist_rpm import bdist_rpm
@@ -122,4 +123,4 @@
 return unittest.makeSuite(BuildRpmTestCase)
 
 if __name__ == '__main__':
- test_support.run_unittest(test_suite())
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_bdist_wininst.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_bdist_wininst.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_bdist_wininst.py	Sat Nov 6 03:44:43 2010
@@ -1,5 +1,6 @@
 """Tests for distutils.command.bdist_wininst."""
 import unittest
+from test.support import run_unittest
 
 from distutils.command.bdist_wininst import bdist_wininst
 from distutils.tests import support
@@ -27,4 +28,4 @@
 return unittest.makeSuite(BuildWinInstTestCase)
 
 if __name__ == '__main__':
- test_support.run_unittest(test_suite())
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_build.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_build.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_build.py	Sat Nov 6 03:44:43 2010
@@ -2,6 +2,7 @@
 import unittest
 import os
 import sys
+from test.support import run_unittest
 
 from distutils.command.build import build
 from distutils.tests import support
@@ -51,4 +52,4 @@
 return unittest.makeSuite(BuildTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_build_clib.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_build_clib.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_build_clib.py	Sat Nov 6 03:44:43 2010
@@ -3,6 +3,8 @@
 import os
 import sys
 
+from test.support import run_unittest
+
 from distutils.command.build_clib import build_clib
 from distutils.errors import DistutilsSetupError
 from distutils.tests import support
@@ -141,4 +143,4 @@
 return unittest.makeSuite(BuildCLibTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_build_ext.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_build_ext.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_build_ext.py	Sat Nov 6 03:44:43 2010
@@ -14,6 +14,7 @@
 
 import unittest
 from test import support
+from test.support import run_unittest
 
 # http://bugs.python.org/issue4373
 # Don't load the xx module more than once.
Modified: python/branches/py3k/Lib/distutils/tests/test_build_py.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_build_py.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_build_py.py	Sat Nov 6 03:44:43 2010
@@ -10,6 +10,7 @@
 from distutils.errors import DistutilsFileError
 
 from distutils.tests import support
+from test.support import run_unittest
 
 
 class BuildPyTestCase(support.TempdirManager,
@@ -114,4 +115,4 @@
 return unittest.makeSuite(BuildPyTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_build_scripts.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_build_scripts.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_build_scripts.py	Sat Nov 6 03:44:43 2010
@@ -8,6 +8,7 @@
 from distutils import sysconfig
 
 from distutils.tests import support
+from test.support import run_unittest
 
 
 class BuildScriptsTestCase(support.TempdirManager,
@@ -108,4 +109,4 @@
 return unittest.makeSuite(BuildScriptsTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_check.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_check.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_check.py	Sat Nov 6 03:44:43 2010
@@ -1,5 +1,6 @@
 """Tests for distutils.command.check."""
 import unittest
+from test.support import run_unittest
 
 from distutils.command.check import check, HAS_DOCUTILS
 from distutils.tests import support
@@ -95,4 +96,4 @@
 return unittest.makeSuite(CheckTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_clean.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_clean.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_clean.py	Sat Nov 6 03:44:43 2010
@@ -6,6 +6,7 @@
 
 from distutils.command.clean import clean
 from distutils.tests import support
+from test.support import run_unittest
 
 class cleanTestCase(support.TempdirManager,
 support.LoggingSilencer,
@@ -47,4 +48,4 @@
 return unittest.makeSuite(cleanTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_cmd.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_cmd.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_cmd.py	Sat Nov 6 03:44:43 2010
@@ -1,7 +1,7 @@
 """Tests for distutils.cmd."""
 import unittest
 import os
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 
 from distutils.cmd import Command
 from distutils.dist import Distribution
@@ -99,7 +99,7 @@
 
 def test_ensure_dirname(self):
 cmd = self.cmd
- cmd.option1 = os.path.dirname(__file__)
+ cmd.option1 = os.path.dirname(__file__) or os.curdir
 cmd.ensure_dirname('option1')
 cmd.option2 = 'xxx'
 self.assertRaises(DistutilsOptionError, cmd.ensure_dirname, 'option2')
@@ -124,4 +124,4 @@
 return unittest.makeSuite(CommandTestCase)
 
 if __name__ == '__main__':
- test_support.run_unittest(test_suite())
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_config.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_config.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_config.py	Sat Nov 6 03:44:43 2010
@@ -10,6 +10,7 @@
 from distutils.log import WARN
 
 from distutils.tests import support
+from test.support import run_unittest
 
 PYPIRC = """\
 [distutils]
@@ -116,4 +117,4 @@
 return unittest.makeSuite(PyPIRCCommandTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_config_cmd.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_config_cmd.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_config_cmd.py	Sat Nov 6 03:44:43 2010
@@ -2,6 +2,7 @@
 import unittest
 import os
 import sys
+from test.support import run_unittest
 
 from distutils.command.config import dump_file, config
 from distutils.tests import support
@@ -86,4 +87,4 @@
 return unittest.makeSuite(ConfigTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_core.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_core.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_core.py	Sat Nov 6 03:44:43 2010
@@ -6,7 +6,7 @@
 import shutil
 import sys
 import test.support
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 import unittest
 from distutils.tests import support
 
@@ -105,4 +105,4 @@
 return unittest.makeSuite(CoreTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_cygwinccompiler.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_cygwinccompiler.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_cygwinccompiler.py	Sat Nov 6 03:44:43 2010
@@ -4,6 +4,7 @@
 import os
 from io import BytesIO
 import subprocess
+from test.support import run_unittest
 
 from distutils import cygwinccompiler
 from distutils.cygwinccompiler import (CygwinCCompiler, check_config_h,
@@ -151,4 +152,4 @@
 return unittest.makeSuite(CygwinCCompilerTestCase)
 
 if __name__ == '__main__':
- test_support.run_unittest(test_suite())
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_dep_util.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_dep_util.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_dep_util.py	Sat Nov 6 03:44:43 2010
@@ -6,6 +6,7 @@
 from distutils.dep_util import newer, newer_pairwise, newer_group
 from distutils.errors import DistutilsFileError
 from distutils.tests import support
+from test.support import run_unittest
 
 class DepUtilTestCase(support.TempdirManager, unittest.TestCase):
 
@@ -77,4 +78,4 @@
 return unittest.makeSuite(DepUtilTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_dir_util.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_dir_util.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_dir_util.py	Sat Nov 6 03:44:43 2010
@@ -10,6 +10,7 @@
 
 from distutils import log
 from distutils.tests import support
+from test.support import run_unittest
 
 class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
 
@@ -112,4 +113,4 @@
 return unittest.makeSuite(DirUtilTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_dist.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_dist.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_dist.py	Sat Nov 6 03:44:43 2010
@@ -9,7 +9,7 @@
 from distutils.dist import Distribution, fix_help_options
 from distutils.cmd import Command
 
-from test.support import TESTFN, captured_stdout
+from test.support import TESTFN, captured_stdout, run_unittest
 from distutils.tests import support
 
 
@@ -325,4 +325,4 @@
 return suite
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_extension.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_extension.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_extension.py	Sat Nov 6 03:44:43 2010
@@ -3,7 +3,7 @@
 import os
 import warnings
 
-from test.support import check_warnings
+from test.support import check_warnings, run_unittest
 from distutils.extension import read_setup_file, Extension
 
 class ExtensionTestCase(unittest.TestCase):
@@ -66,4 +66,4 @@
 return unittest.makeSuite(ExtensionTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_file_util.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_file_util.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_file_util.py	Sat Nov 6 03:44:43 2010
@@ -6,6 +6,7 @@
 from distutils.file_util import move_file
 from distutils import log
 from distutils.tests import support
+from test.support import run_unittest
 
 class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
 
@@ -62,4 +63,4 @@
 return unittest.makeSuite(FileUtilTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_filelist.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_filelist.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_filelist.py	Sat Nov 6 03:44:43 2010
@@ -2,7 +2,7 @@
 import unittest
 
 from distutils.filelist import glob_to_re, FileList
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 from distutils import debug
 
 class FileListTestCase(unittest.TestCase):
@@ -39,4 +39,4 @@
 return unittest.makeSuite(FileListTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_install.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_install.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_install.py	Sat Nov 6 03:44:43 2010
@@ -6,7 +6,7 @@
 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 @@
 return unittest.makeSuite(InstallTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_install_data.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_install_data.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_install_data.py	Sat Nov 6 03:44:43 2010
@@ -6,6 +6,7 @@
 
 from distutils.command.install_data import install_data
 from distutils.tests import support
+from test.support import run_unittest
 
 class InstallDataTestCase(support.TempdirManager,
 support.LoggingSilencer,
@@ -73,4 +74,4 @@
 return unittest.makeSuite(InstallDataTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_install_headers.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_install_headers.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_install_headers.py	Sat Nov 6 03:44:43 2010
@@ -6,6 +6,7 @@
 
 from distutils.command.install_headers import install_headers
 from distutils.tests import support
+from test.support import run_unittest
 
 class InstallHeadersTestCase(support.TempdirManager,
 support.LoggingSilencer,
@@ -37,4 +38,4 @@
 return unittest.makeSuite(InstallHeadersTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_install_lib.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_install_lib.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_install_lib.py	Sat Nov 6 03:44:43 2010
@@ -7,6 +7,7 @@
 from distutils.extension import Extension
 from distutils.tests import support
 from distutils.errors import DistutilsOptionError
+from test.support import run_unittest
 
 class InstallLibTestCase(support.TempdirManager,
 support.LoggingSilencer,
@@ -98,4 +99,4 @@
 return unittest.makeSuite(InstallLibTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_install_scripts.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_install_scripts.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_install_scripts.py	Sat Nov 6 03:44:43 2010
@@ -7,6 +7,7 @@
 from distutils.core import Distribution
 
 from distutils.tests import support
+from test.support import run_unittest
 
 
 class InstallScriptsTestCase(support.TempdirManager,
@@ -78,4 +79,4 @@
 return unittest.makeSuite(InstallScriptsTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_log.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_log.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_log.py	Sat Nov 6 03:44:43 2010
@@ -3,6 +3,7 @@
 import sys
 import unittest
 from tempfile import NamedTemporaryFile
+from test.support import run_unittest
 
 from distutils import log
 
@@ -33,4 +34,4 @@
 return unittest.makeSuite(TestLog)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_msvc9compiler.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_msvc9compiler.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_msvc9compiler.py	Sat Nov 6 03:44:43 2010
@@ -5,6 +5,7 @@
 
 from distutils.errors import DistutilsPlatformError
 from distutils.tests import support
+from test.support import run_unittest
 
 _MANIFEST = """\
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -137,4 +138,4 @@
 return unittest.makeSuite(msvc9compilerTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_register.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_register.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_register.py	Sat Nov 6 03:44:43 2010
@@ -6,7 +6,7 @@
 import urllib
 import warnings
 
-from test.support import check_warnings
+from test.support import check_warnings, run_unittest
 
 from distutils.command import register as register_module
 from distutils.command.register import register
@@ -259,4 +259,4 @@
 return unittest.makeSuite(RegisterTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_sdist.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_sdist.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_sdist.py	Sat Nov 6 03:44:43 2010
@@ -8,11 +8,9 @@
 import tempfile
 import warnings
 
-from test.support import check_warnings
-from test.support import captured_stdout
+from test.support import captured_stdout, check_warnings, run_unittest
 
-from distutils.command.sdist import sdist
-from distutils.command.sdist import show_formats
+from distutils.command.sdist import sdist, show_formats
 from distutils.core import Distribution
 from distutils.tests.test_config import PyPIRCCommandTestCase
 from distutils.errors import DistutilsExecError, DistutilsOptionError
@@ -358,4 +356,4 @@
 return unittest.makeSuite(SDistTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_spawn.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_spawn.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_spawn.py	Sat Nov 6 03:44:43 2010
@@ -2,7 +2,7 @@
 import unittest
 import os
 import time
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 
 from distutils.spawn import _nt_quote_args
 from distutils.spawn import spawn, find_executable
@@ -55,4 +55,4 @@
 return unittest.makeSuite(SpawnTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_text_file.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_text_file.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_text_file.py	Sat Nov 6 03:44:43 2010
@@ -3,6 +3,7 @@
 import unittest
 from distutils.text_file import TextFile
 from distutils.tests import support
+from test.support import run_unittest
 
 TEST_DATA = """# test file
 
@@ -103,4 +104,4 @@
 return unittest.makeSuite(TextFileTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_unixccompiler.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_unixccompiler.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_unixccompiler.py	Sat Nov 6 03:44:43 2010
@@ -1,6 +1,7 @@
 """Tests for distutils.unixccompiler."""
 import sys
 import unittest
+from test.support import run_unittest
 
 from distutils import sysconfig
 from distutils.unixccompiler import UnixCCompiler
@@ -118,4 +119,4 @@
 return unittest.makeSuite(UnixCCompilerTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_upload.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_upload.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_upload.py	Sat Nov 6 03:44:43 2010
@@ -1,13 +1,12 @@
 """Tests for distutils.command.upload."""
-import sys
 import os
 import unittest
 import http.client as httpclient
+from test.support import run_unittest
 
 from distutils.command.upload import upload
 from distutils.core import Distribution
 
-from distutils.tests import support
 from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
 
 PYPIRC_LONG_PASSWORD = """\
@@ -136,4 +135,4 @@
 return unittest.makeSuite(uploadTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_util.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_util.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_util.py	Sat Nov 6 03:44:43 2010
@@ -3,6 +3,7 @@
 import sys
 import unittest
 from copy import copy
+from test.support import run_unittest
 
 from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
 from distutils.util import (get_platform, convert_path, change_root,
@@ -274,4 +275,4 @@
 return unittest.makeSuite(UtilTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_version.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_version.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_version.py	Sat Nov 6 03:44:43 2010
@@ -2,6 +2,7 @@
 import unittest
 from distutils.version import LooseVersion
 from distutils.version import StrictVersion
+from test.support import run_unittest
 
 class VersionTestCase(unittest.TestCase):
 
@@ -67,4 +68,4 @@
 return unittest.makeSuite(VersionTestCase)
 
 if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_versionpredicate.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_versionpredicate.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_versionpredicate.py	Sat Nov 6 03:44:43 2010
@@ -4,6 +4,10 @@
 
 import distutils.versionpredicate
 import doctest
+from test.support import run_unittest
 
 def test_suite():
 return doctest.DocTestSuite(distutils.versionpredicate)
+
+if __name__ == '__main__':
+ run_unittest(test_suite())
