diff options
Diffstat (limited to 'src/distutils2/tests')
42 files changed, 209 insertions, 324 deletions
diff --git a/src/distutils2/tests/__init__.py b/src/distutils2/tests/__init__.py index 7bdb912..1b83d1f 100644 --- a/src/distutils2/tests/__init__.py +++ b/src/distutils2/tests/__init__.py @@ -3,7 +3,7 @@ This test suite consists of a collection of test modules in the distutils.tests package. Each test module has a name starting with 'test' and contains a function test_suite(). The function is expected -to return an initialized unittest.TestSuite instance. +to return an initialized unittest2.TestSuite instance. Tests for the command classes in the distutils.command package are included in distutils.tests as well, instead of using a separate @@ -14,14 +14,14 @@ by import rather than matching pre-defined names. import os import sys -import unittest +import unittest2 here = os.path.dirname(__file__) def test_suite(): - suite = unittest.TestSuite() + suite = unittest2.TestSuite() for fn in os.listdir(here): if fn.startswith("test") and fn.endswith(".py"): modname = "distutils.tests." + fn[:-3] @@ -32,4 +32,4 @@ def test_suite(): if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_archive_util.py b/src/distutils2/tests/test_archive_util.py deleted file mode 100644 index edbca96..0000000 --- a/src/distutils2/tests/test_archive_util.py +++ /dev/null @@ -1,45 +0,0 @@ -"""Tests for distutils.archive_util.""" -__revision__ = "$Id: test_archive_util.py 75659 2009-10-24 13:29:44Z tarek.ziade $" - -import unittest -import warnings -from distutils2.archive_util import (check_archive_formats, make_archive, - make_tarball, make_zipfile) -from test.test_support import check_warnings - -class ArchiveUtilTestCase(unittest.TestCase): - - def test_warnings(self): - # other tests were moved in test_shutil, but let's make sure a warning - # is popped if the old api is used - with check_warnings() as w: - warnings.simplefilter("always") - - # doing various "valid" calls to trigger warnings - self.assertEquals(check_archive_formats(['gztar', 'xxx', 'zip']), - 'xxx') - self.assertEquals(check_archive_formats(['gztar', 'zip']), None) - - try: - make_archive('xx', 'xx') - except ValueError: - pass - - try: - make_tarball('IDONTEXIST', 'IDONTEXIST') - except Exception: - pass - - try: - make_zipfile('IDONTEXIST', 'IDONTEXIST') - except Exception: - pass - - self.assertEquals(len(w.warnings), 5) - - -def test_suite(): - return unittest.makeSuite(ArchiveUtilTestCase) - -if __name__ == "__main__": - unittest.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_bdist.py b/src/distutils2/tests/test_bdist.py index d1fd572..a8cc178 100644 --- a/src/distutils2/tests/test_bdist.py +++ b/src/distutils2/tests/test_bdist.py @@ -1,5 +1,5 @@ """Tests for distutils.command.bdist.""" -import unittest +import unittest2 import sys import os import tempfile @@ -15,7 +15,7 @@ from distutils2 import spawn from distutils2.errors import DistutilsExecError class BuildTestCase(support.TempdirManager, - unittest.TestCase): + unittest2.TestCase): def test_formats(self): @@ -39,7 +39,7 @@ class BuildTestCase(support.TempdirManager, self.assertEquals(founded, formats) def test_suite(): - return unittest.makeSuite(BuildTestCase) + return unittest2.makeSuite(BuildTestCase) if __name__ == '__main__': run_unittest(test_suite()) diff --git a/src/distutils2/tests/test_bdist_dumb.py b/src/distutils2/tests/test_bdist_dumb.py index 0624524..f275e5b 100644 --- a/src/distutils2/tests/test_bdist_dumb.py +++ b/src/distutils2/tests/test_bdist_dumb.py @@ -1,6 +1,6 @@ """Tests for distutils.command.bdist_dumb.""" -import unittest +import unittest2 import sys import os @@ -29,7 +29,7 @@ setup(name='foo', version='0.1', py_modules=['foo'], class BuildDumbTestCase(support.TempdirManager, support.LoggingSilencer, support.EnvironGuard, - unittest.TestCase): + unittest2.TestCase): def setUp(self): super(BuildDumbTestCase, self).setUp() @@ -42,7 +42,7 @@ class BuildDumbTestCase(support.TempdirManager, sys.argv[:] = self.old_sys_argv[1] super(BuildDumbTestCase, self).tearDown() - @unittest.skipUnless(zlib, "requires zlib") + @unittest2.skipUnless(zlib, "requires zlib") def test_simple_built(self): # let's create a simple package @@ -99,7 +99,7 @@ class BuildDumbTestCase(support.TempdirManager, self.assertEquals(cmd.format, default) def test_suite(): - return unittest.makeSuite(BuildDumbTestCase) + return unittest2.makeSuite(BuildDumbTestCase) if __name__ == '__main__': run_unittest(test_suite()) diff --git a/src/distutils2/tests/test_bdist_msi.py b/src/distutils2/tests/test_bdist_msi.py index 0fbc928..145947d 100644 --- a/src/distutils2/tests/test_bdist_msi.py +++ b/src/distutils2/tests/test_bdist_msi.py @@ -1,15 +1,15 @@ """Tests for distutils.command.bdist_msi.""" -import unittest +import unittest2 import sys from test.test_support import run_unittest from distutils2.tests import support -@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32") +@unittest2.skipUnless(sys.platform=="win32", "These tests are only for win32") class BDistMSITestCase(support.TempdirManager, support.LoggingSilencer, - unittest.TestCase): + unittest2.TestCase): def test_minial(self): # minimal test XXX need more tests @@ -19,7 +19,7 @@ class BDistMSITestCase(support.TempdirManager, cmd.ensure_finalized() def test_suite(): - return unittest.makeSuite(BDistMSITestCase) + return unittest2.makeSuite(BDistMSITestCase) if __name__ == '__main__': run_unittest(test_suite()) diff --git a/src/distutils2/tests/test_bdist_rpm.py b/src/distutils2/tests/test_bdist_rpm.py index 8034e20..b5f613c 100644 --- a/src/distutils2/tests/test_bdist_rpm.py +++ b/src/distutils2/tests/test_bdist_rpm.py @@ -1,6 +1,6 @@ """Tests for distutils.command.bdist_rpm.""" -import unittest +import unittest2 import sys import os import tempfile @@ -26,7 +26,7 @@ setup(name='foo', version='0.1', py_modules=['foo'], class BuildRpmTestCase(support.TempdirManager, support.LoggingSilencer, - unittest.TestCase): + unittest2.TestCase): def setUp(self): super(BuildRpmTestCase, self).setUp() @@ -121,7 +121,7 @@ class BuildRpmTestCase(support.TempdirManager, os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm')) def test_suite(): - return unittest.makeSuite(BuildRpmTestCase) + return unittest2.makeSuite(BuildRpmTestCase) if __name__ == '__main__': run_unittest(test_suite()) diff --git a/src/distutils2/tests/test_bdist_wininst.py b/src/distutils2/tests/test_bdist_wininst.py index 4ea3c1d..181d61b 100644 --- a/src/distutils2/tests/test_bdist_wininst.py +++ b/src/distutils2/tests/test_bdist_wininst.py @@ -1,5 +1,5 @@ """Tests for distutils.command.bdist_wininst.""" -import unittest +import unittest2 from test.test_support import run_unittest @@ -8,7 +8,7 @@ from distutils2.tests import support class BuildWinInstTestCase(support.TempdirManager, support.LoggingSilencer, - unittest.TestCase): + unittest2.TestCase): def test_get_exe_bytes(self): @@ -26,7 +26,7 @@ class BuildWinInstTestCase(support.TempdirManager, self.assertTrue(len(exe_file) > 10) def test_suite(): - return unittest.makeSuite(BuildWinInstTestCase) + return unittest2.makeSuite(BuildWinInstTestCase) if __name__ == '__main__': run_unittest(test_suite()) diff --git a/src/distutils2/tests/test_build.py b/src/distutils2/tests/test_build.py index 7a073d1..0669583 100644 --- a/src/distutils2/tests/test_build.py +++ b/src/distutils2/tests/test_build.py @@ -1,15 +1,18 @@ """Tests for distutils.command.build.""" -import unittest +import unittest2 import os import sys from distutils2.command.build import build from distutils2.tests import support -from sysconfig import get_platform +try: + from sysconfig import get_platform +except ImportError: + from distutils2._backport.sysconfig import get_platform class BuildTestCase(support.TempdirManager, support.LoggingSilencer, - unittest.TestCase): + unittest2.TestCase): def test_finalize_options(self): pkg_dir, dist = self.create_dist() @@ -48,7 +51,7 @@ class BuildTestCase(support.TempdirManager, self.assertEquals(cmd.executable, os.path.normpath(sys.executable)) def test_suite(): - return unittest.makeSuite(BuildTestCase) + return unittest2.makeSuite(BuildTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_build_clib.py b/src/distutils2/tests/test_build_clib.py index 8cc4982..98a1247 100644 --- a/src/distutils2/tests/test_build_clib.py +++ b/src/distutils2/tests/test_build_clib.py @@ -1,5 +1,5 @@ """Tests for distutils.command.build_clib.""" -import unittest +import unittest2 import os import sys @@ -10,7 +10,7 @@ from distutils2.spawn import find_executable class BuildCLibTestCase(support.TempdirManager, support.LoggingSilencer, - unittest.TestCase): + unittest2.TestCase): def test_check_library_dist(self): pkg_dir, dist = self.create_dist() @@ -137,7 +137,7 @@ class BuildCLibTestCase(support.TempdirManager, self.assertTrue('libfoo.a' in os.listdir(build_temp)) def test_suite(): - return unittest.makeSuite(BuildCLibTestCase) + return unittest2.makeSuite(BuildCLibTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_build_ext.py b/src/distutils2/tests/test_build_ext.py index e7b2d11..15a1c72 100644 --- a/src/distutils2/tests/test_build_ext.py +++ b/src/distutils2/tests/test_build_ext.py @@ -9,26 +9,29 @@ from test.test_support import captured_stdout from distutils2.core import Extension, Distribution from distutils2.command.build_ext import build_ext -import sysconfig from distutils2.tests import support from distutils2.extension import Extension from distutils2.errors import (UnknownFileError, DistutilsSetupError, - CompileError) + CompileError) +try: + import sysconfig +except ImportError: + from distutils2._backport import sysconfig -import unittest +import unittest2 from test import test_support # http://bugs.python.org/issue4373 # Don't load the xx module more than once. ALREADY_TESTED = False +CURDIR = os.path.abspath(os.path.dirname(__file__)) def _get_source_filename(): - srcdir = sysconfig.get_config_var('srcdir') - return os.path.join(srcdir, 'Modules', 'xxmodule.c') + return os.path.join(CURDIR, 'xxmodule.c') class BuildExtTestCase(support.TempdirManager, support.LoggingSilencer, - unittest.TestCase): + unittest2.TestCase): def setUp(self): # Create a simple test environment # Note that we're making changes to sys.path @@ -105,7 +108,11 @@ class BuildExtTestCase(support.TempdirManager, old = sys.platform sys.platform = 'sunos' # fooling finalize_options - from sysconfig import _CONFIG_VARS + try: + from sysconfig import _CONFIG_VARS + except ImportError: + from distutils2._backport.sysconfig import _CONFIG_VARS + old_var = _CONFIG_VARS.get('Py_ENABLE_SHARED') _CONFIG_VARS['Py_ENABLE_SHARED'] = 1 try: @@ -425,8 +432,8 @@ def test_suite(): if test_support.verbose: print ('test_build_ext: Cannot find source code (test' ' must run in python build dir)') - return unittest.TestSuite() - else: return unittest.makeSuite(BuildExtTestCase) + return unittest2.TestSuite() + else: return unittest2.makeSuite(BuildExtTestCase) if __name__ == '__main__': test_support.run_unittest(test_suite()) diff --git a/src/distutils2/tests/test_build_py.py b/src/distutils2/tests/test_build_py.py index 0e47c50..5d08f0f 100644 --- a/src/distutils2/tests/test_build_py.py +++ b/src/distutils2/tests/test_build_py.py @@ -3,7 +3,7 @@ import os import sys import StringIO -import unittest +import unittest2 from distutils2.command.build_py import build_py from distutils2.core import Distribution @@ -14,7 +14,7 @@ from distutils2.tests import support class BuildPyTestCase(support.TempdirManager, support.LoggingSilencer, - unittest.TestCase): + unittest2.TestCase): def test_package_data(self): sources = self.mkdtemp() @@ -107,7 +107,7 @@ class BuildPyTestCase(support.TempdirManager, self.assertTrue('byte-compiling is disabled' in self.logs[0][1]) def test_suite(): - return unittest.makeSuite(BuildPyTestCase) + return unittest2.makeSuite(BuildPyTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_build_scripts.py b/src/distutils2/tests/test_build_scripts.py index 6854600..63ccdcc 100644 --- a/src/distutils2/tests/test_build_scripts.py +++ b/src/distutils2/tests/test_build_scripts.py @@ -1,18 +1,21 @@ """Tests for distutils.command.build_scripts.""" import os -import unittest +import unittest2 from distutils2.command.build_scripts import build_scripts from distutils2.core import Distribution -import sysconfig +try: + import sysconfig +except ImportError: + from distutils2._backport import sysconfig from distutils2.tests import support class BuildScriptsTestCase(support.TempdirManager, support.LoggingSilencer, - unittest.TestCase): + unittest2.TestCase): def test_default_settings(self): cmd = self.get_build_scripts_cmd("/foo/bar", []) @@ -103,7 +106,7 @@ class BuildScriptsTestCase(support.TempdirManager, self.assertTrue(name in built) def test_suite(): - return unittest.makeSuite(BuildScriptsTestCase) + return unittest2.makeSuite(BuildScriptsTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_ccompiler.py b/src/distutils2/tests/test_ccompiler.py index 247aaa5..43d231a 100644 --- a/src/distutils2/tests/test_ccompiler.py +++ b/src/distutils2/tests/test_ccompiler.py @@ -1,6 +1,6 @@ """Tests for distutils.ccompiler.""" import os -import unittest +import unittest2 from test.test_support import captured_stdout from distutils2.ccompiler import (gen_lib_options, CCompiler, @@ -21,7 +21,7 @@ class FakeCompiler(object): def library_option(self, lib): return "-l" + lib -class CCompilerTestCase(support.EnvironGuard, unittest.TestCase): +class CCompilerTestCase(support.EnvironGuard, unittest2.TestCase): def test_gen_lib_options(self): compiler = FakeCompiler() @@ -75,7 +75,7 @@ class CCompilerTestCase(support.EnvironGuard, unittest.TestCase): self.assertEquals(comp.exes['archiver'], 'my_ar -arflags') def test_suite(): - return unittest.makeSuite(CCompilerTestCase) + return unittest2.makeSuite(CCompilerTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_check.py b/src/distutils2/tests/test_check.py index ce60119..5fd15b5 100644 --- a/src/distutils2/tests/test_check.py +++ b/src/distutils2/tests/test_check.py @@ -1,5 +1,5 @@ """Tests for distutils.command.check.""" -import unittest +import unittest2 from distutils2.command.check import check, HAS_DOCUTILS from distutils2.tests import support @@ -7,7 +7,7 @@ from distutils2.errors import DistutilsSetupError class CheckTestCase(support.LoggingSilencer, support.TempdirManager, - unittest.TestCase): + unittest2.TestCase): def _run(self, metadata=None, **options): if metadata is None: @@ -92,7 +92,7 @@ class CheckTestCase(support.LoggingSilencer, 'restructuredtext': 1}) def test_suite(): - return unittest.makeSuite(CheckTestCase) + return unittest2.makeSuite(CheckTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_clean.py b/src/distutils2/tests/test_clean.py index a55a6f7..641e70b 100755 --- a/src/distutils2/tests/test_clean.py +++ b/src/distutils2/tests/test_clean.py @@ -1,7 +1,7 @@ """Tests for distutils.command.clean.""" import sys import os -import unittest +import unittest2 import getpass from distutils2.command.clean import clean @@ -9,7 +9,7 @@ from distutils2.tests import support class cleanTestCase(support.TempdirManager, support.LoggingSilencer, - unittest.TestCase): + unittest2.TestCase): def test_simple_run(self): pkg_dir, dist = self.create_dist() @@ -44,7 +44,7 @@ class cleanTestCase(support.TempdirManager, cmd.run() def test_suite(): - return unittest.makeSuite(cleanTestCase) + return unittest2.makeSuite(cleanTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_cmd.py b/src/distutils2/tests/test_cmd.py index a2ded82..03fffd1 100644 --- a/src/distutils2/tests/test_cmd.py +++ b/src/distutils2/tests/test_cmd.py @@ -1,5 +1,5 @@ """Tests for distutils.cmd.""" -import unittest +import unittest2 import os from test.test_support import captured_stdout, run_unittest @@ -12,7 +12,7 @@ class MyCmd(Command): def initialize_options(self): pass -class CommandTestCase(unittest.TestCase): +class CommandTestCase(unittest2.TestCase): def setUp(self): dist = Distribution() @@ -121,7 +121,7 @@ class CommandTestCase(unittest.TestCase): debug.DEBUG = False def test_suite(): - return unittest.makeSuite(CommandTestCase) + return unittest2.makeSuite(CommandTestCase) if __name__ == '__main__': run_unittest(test_suite()) diff --git a/src/distutils2/tests/test_config.py b/src/distutils2/tests/test_config.py index 66ac1c9..25b48b0 100644 --- a/src/distutils2/tests/test_config.py +++ b/src/distutils2/tests/test_config.py @@ -1,7 +1,7 @@ """Tests for distutils.pypirc.pypirc.""" import sys import os -import unittest +import unittest2 import tempfile import shutil @@ -50,7 +50,7 @@ password:xxx class PyPIRCCommandTestCase(support.TempdirManager, support.LoggingSilencer, support.EnvironGuard, - unittest.TestCase): + unittest2.TestCase): def setUp(self): """Patches the environment.""" @@ -112,7 +112,7 @@ class PyPIRCCommandTestCase(support.TempdirManager, self.assertEquals(content, WANTED) def test_suite(): - return unittest.makeSuite(PyPIRCCommandTestCase) + return unittest2.makeSuite(PyPIRCCommandTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_config_cmd.py b/src/distutils2/tests/test_config_cmd.py index bd74db4..51a816e 100644 --- a/src/distutils2/tests/test_config_cmd.py +++ b/src/distutils2/tests/test_config_cmd.py @@ -1,5 +1,5 @@ """Tests for distutils.command.config.""" -import unittest +import unittest2 import os import sys @@ -9,7 +9,7 @@ from distutils2 import log class ConfigTestCase(support.LoggingSilencer, support.TempdirManager, - unittest.TestCase): + unittest2.TestCase): def _info(self, msg, *args): for line in msg.splitlines(): @@ -83,7 +83,7 @@ class ConfigTestCase(support.LoggingSilencer, self.assertTrue(not os.path.exists(f)) def test_suite(): - return unittest.makeSuite(ConfigTestCase) + return unittest2.makeSuite(ConfigTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_core.py b/src/distutils2/tests/test_core.py index 3f4e172..a33e203 100644 --- a/src/distutils2/tests/test_core.py +++ b/src/distutils2/tests/test_core.py @@ -7,7 +7,7 @@ import shutil import sys import test.test_support from test.test_support import captured_stdout -import unittest +import unittest2 from distutils2.tests import support # setup script that uses __file__ @@ -29,7 +29,7 @@ setup() """ -class CoreTestCase(support.EnvironGuard, unittest.TestCase): +class CoreTestCase(support.EnvironGuard, unittest2.TestCase): def setUp(self): super(CoreTestCase, self).setUp() @@ -98,7 +98,7 @@ class CoreTestCase(support.EnvironGuard, unittest.TestCase): self.assertEquals(stdout.readlines()[0], wanted) def test_suite(): - return unittest.makeSuite(CoreTestCase) + return unittest2.makeSuite(CoreTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_cygwinccompiler.py b/src/distutils2/tests/test_cygwinccompiler.py index 00d3c5b..5a06c87 100644 --- a/src/distutils2/tests/test_cygwinccompiler.py +++ b/src/distutils2/tests/test_cygwinccompiler.py @@ -1,9 +1,12 @@ """Tests for distutils.cygwinccompiler.""" -import unittest +import unittest2 import sys import os import warnings -import sysconfig +try: + import sysconfig +except ImportError: + from distutils2._backport import sysconfig from test.test_support import check_warnings, run_unittest from test.test_support import captured_stdout @@ -17,7 +20,7 @@ from distutils2.util import get_compiler_versions from distutils2.tests import support class CygwinCCompilerTestCase(support.TempdirManager, - unittest.TestCase): + unittest2.TestCase): def setUp(self): super(CygwinCCompilerTestCase, self).setUp() @@ -105,7 +108,7 @@ class CygwinCCompilerTestCase(support.TempdirManager, self.assertEquals(len(w.warnings), 2) def test_suite(): - return unittest.makeSuite(CygwinCCompilerTestCase) + return unittest2.makeSuite(CygwinCCompilerTestCase) if __name__ == '__main__': run_unittest(test_suite()) diff --git a/src/distutils2/tests/test_dep_util.py b/src/distutils2/tests/test_dep_util.py index b553ea8..366ee55 100644 --- a/src/distutils2/tests/test_dep_util.py +++ b/src/distutils2/tests/test_dep_util.py @@ -1,5 +1,5 @@ """Tests for distutils.dep_util.""" -import unittest +import unittest2 import os import time @@ -7,7 +7,7 @@ from distutils2.dep_util import newer, newer_pairwise, newer_group from distutils2.errors import DistutilsFileError from distutils2.tests import support -class DepUtilTestCase(support.TempdirManager, unittest.TestCase): +class DepUtilTestCase(support.TempdirManager, unittest2.TestCase): def test_newer(self): @@ -74,7 +74,7 @@ class DepUtilTestCase(support.TempdirManager, unittest.TestCase): def test_suite(): - return unittest.makeSuite(DepUtilTestCase) + return unittest2.makeSuite(DepUtilTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_dir_util.py b/src/distutils2/tests/test_dir_util.py index bd05f3a..3979d1c 100644 --- a/src/distutils2/tests/test_dir_util.py +++ b/src/distutils2/tests/test_dir_util.py @@ -1,5 +1,5 @@ """Tests for distutils.dir_util.""" -import unittest +import unittest2 import os import shutil @@ -9,7 +9,7 @@ from distutils2.dir_util import (mkpath, remove_tree, create_tree, copy_tree, from distutils2 import log from distutils2.tests import support -class DirUtilTestCase(support.TempdirManager, unittest.TestCase): +class DirUtilTestCase(support.TempdirManager, unittest2.TestCase): def _log(self, msg, *args): if len(args) > 0: @@ -92,7 +92,7 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase): self.assertEquals(ensure_relative('home\\foo'), 'home\\foo') def test_suite(): - return unittest.makeSuite(DirUtilTestCase) + return unittest2.makeSuite(DirUtilTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_dist.py b/src/distutils2/tests/test_dist.py index 8885259..b58d773 100644 --- a/src/distutils2/tests/test_dist.py +++ b/src/distutils2/tests/test_dist.py @@ -4,7 +4,7 @@ import os import StringIO import sys -import unittest +import unittest2 import warnings import textwrap @@ -40,7 +40,7 @@ class TestDistribution(Distribution): class DistributionTestCase(support.TempdirManager, support.LoggingSilencer, support.EnvironGuard, - unittest.TestCase): + unittest2.TestCase): def setUp(self): super(DistributionTestCase, self).setUp() @@ -240,7 +240,7 @@ class DistributionTestCase(support.TempdirManager, class MetadataTestCase(support.TempdirManager, support.EnvironGuard, - unittest.TestCase): + unittest2.TestCase): def setUp(self): super(MetadataTestCase, self).setUp() @@ -425,10 +425,10 @@ class MetadataTestCase(support.TempdirManager, support.EnvironGuard, self.assertEquals(metadata.requires, ['foo']) def test_suite(): - suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(DistributionTestCase)) - suite.addTest(unittest.makeSuite(MetadataTestCase)) + suite = unittest2.TestSuite() + suite.addTest(unittest2.makeSuite(DistributionTestCase)) + suite.addTest(unittest2.makeSuite(MetadataTestCase)) return suite if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_emxccompiler.py b/src/distutils2/tests/test_emxccompiler.py index 39543a5..7cf363b 100644 --- a/src/distutils2/tests/test_emxccompiler.py +++ b/src/distutils2/tests/test_emxccompiler.py @@ -1,5 +1,5 @@ """Tests for distutils.emxccompiler.""" -import unittest +import unittest2 import sys import os import warnings @@ -12,7 +12,7 @@ from distutils2.util import get_compiler_versions from distutils2.tests import support class EmxCCompilerTestCase(support.TempdirManager, - unittest.TestCase): + unittest2.TestCase): def test_get_version_deprecated(self): with check_warnings() as w: @@ -27,7 +27,7 @@ class EmxCCompilerTestCase(support.TempdirManager, self.assertEquals(len(w.warnings), 1) def test_suite(): - return unittest.makeSuite(EmxCCompilerTestCase) + return unittest2.makeSuite(EmxCCompilerTestCase) if __name__ == '__main__': run_unittest(test_suite()) diff --git a/src/distutils2/tests/test_extension.py b/src/distutils2/tests/test_extension.py index cc2c281..c2cfd07 100755 --- a/src/distutils2/tests/test_extension.py +++ b/src/distutils2/tests/test_extension.py @@ -1,5 +1,5 @@ """Tests for distutils.extension.""" -import unittest +import unittest2 import os import warnings @@ -7,7 +7,7 @@ from test.test_support import check_warnings from distutils2.extension import read_setup_file, Extension from distutils2.tests.support import capture_warnings -class ExtensionTestCase(unittest.TestCase): +class ExtensionTestCase(unittest2.TestCase): @capture_warnings def test_read_setup_file(self): @@ -65,7 +65,7 @@ class ExtensionTestCase(unittest.TestCase): "Unknown Extension options: 'chic'") def test_suite(): - return unittest.makeSuite(ExtensionTestCase) + return unittest2.makeSuite(ExtensionTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_file_util.py b/src/distutils2/tests/test_file_util.py index 914b87e..269db03 100644 --- a/src/distutils2/tests/test_file_util.py +++ b/src/distutils2/tests/test_file_util.py @@ -1,5 +1,5 @@ """Tests for distutils.file_util.""" -import unittest +import unittest2 import os import shutil @@ -7,7 +7,7 @@ from distutils2.file_util import move_file, write_file, copy_file from distutils2 import log from distutils2.tests import support -class FileUtilTestCase(support.TempdirManager, unittest.TestCase): +class FileUtilTestCase(support.TempdirManager, unittest2.TestCase): def _log(self, msg, *args): if len(args) > 0: @@ -72,7 +72,7 @@ class FileUtilTestCase(support.TempdirManager, unittest.TestCase): self.assertTrue(os.path.exists(os.path.join(dst_dir, 'foo'))) def test_suite(): - return unittest.makeSuite(FileUtilTestCase) + return unittest2.makeSuite(FileUtilTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_filelist.py b/src/distutils2/tests/test_filelist.py index 95d3075..70a519a 100644 --- a/src/distutils2/tests/test_filelist.py +++ b/src/distutils2/tests/test_filelist.py @@ -1,6 +1,6 @@ """Tests for distutils.filelist.""" from os.path import join -import unittest +import unittest2 from test.test_support import captured_stdout from distutils2.filelist import glob_to_re, FileList @@ -20,9 +20,10 @@ graft dir prune dir3 """ -class FileListTestCase(unittest.TestCase): +class FileListTestCase(unittest2.TestCase): - def test_glob_to_re(self): + # this only works on 2.7 + def _test_glob_to_re(self): # simple cases self.assertEquals(glob_to_re('foo*'), 'foo[^/]*\\Z(?ms)') self.assertEquals(glob_to_re('foo?'), 'foo[^/]\\Z(?ms)') @@ -79,7 +80,7 @@ class FileListTestCase(unittest.TestCase): debug.DEBUG = False def test_suite(): - return unittest.makeSuite(FileListTestCase) + return unittest2.makeSuite(FileListTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_install.py b/src/distutils2/tests/test_install.py index fb5fb30..3390fdb 100644 --- a/src/distutils2/tests/test_install.py +++ b/src/distutils2/tests/test_install.py @@ -3,11 +3,19 @@ import os import os.path import sys -import unittest +import unittest2 import site -import sysconfig -from sysconfig import (get_scheme_names, _CONFIG_VARS, _INSTALL_SCHEMES, - get_config_var, get_path) + +try: + import sysconfig + from sysconfig import (get_scheme_names, _CONFIG_VARS, _INSTALL_SCHEMES, + get_config_var, get_path) +except ImportError: + from distutils2._backport import sysconfig + from distutils2._backport.sysconfig import (get_scheme_names, + _CONFIG_VARS, + _INSTALL_SCHEMES, + get_config_var, get_path) from test.test_support import captured_stdout @@ -21,7 +29,7 @@ from distutils2.tests import support class InstallTestCase(support.TempdirManager, support.EnvironGuard, support.LoggingSilencer, - unittest.TestCase): + unittest2.TestCase): def test_home_installation_scheme(self): # This ensure two things: @@ -212,7 +220,7 @@ class InstallTestCase(support.TempdirManager, self.assertTrue(len(self.logs) > old_logs_len) def test_suite(): - return unittest.makeSuite(InstallTestCase) + return unittest2.makeSuite(InstallTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_install_data.py b/src/distutils2/tests/test_install_data.py index 00884d4..16d5917 100644 --- a/src/distutils2/tests/test_install_data.py +++ b/src/distutils2/tests/test_install_data.py @@ -1,7 +1,7 @@ """Tests for distutils.command.install_data.""" import sys import os -import unittest +import unittest2 import getpass from distutils2.command.install_data import install_data @@ -10,7 +10,7 @@ from distutils2.tests import support class InstallDataTestCase(support.TempdirManager, support.LoggingSilencer, support.EnvironGuard, - unittest.TestCase): + unittest2.TestCase): def test_simple_run(self): pkg_dir, dist = self.create_dist() @@ -70,7 +70,7 @@ class InstallDataTestCase(support.TempdirManager, self.assertTrue(os.path.exists(os.path.join(inst, rone))) def test_suite(): - return unittest.makeSuite(InstallDataTestCase) + return unittest2.makeSuite(InstallDataTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_install_headers.py b/src/distutils2/tests/test_install_headers.py index 851d502..222269d 100644 --- a/src/distutils2/tests/test_install_headers.py +++ b/src/distutils2/tests/test_install_headers.py @@ -1,7 +1,7 @@ """Tests for distutils.command.install_headers.""" import sys import os -import unittest +import unittest2 import getpass from distutils2.command.install_headers import install_headers @@ -10,7 +10,7 @@ from distutils2.tests import support class InstallHeadersTestCase(support.TempdirManager, support.LoggingSilencer, support.EnvironGuard, - unittest.TestCase): + unittest2.TestCase): def test_simple_run(self): # we have two headers @@ -34,7 +34,7 @@ class InstallHeadersTestCase(support.TempdirManager, self.assertEquals(len(cmd.get_outputs()), 2) def test_suite(): - return unittest.makeSuite(InstallHeadersTestCase) + return unittest2.makeSuite(InstallHeadersTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_install_lib.py b/src/distutils2/tests/test_install_lib.py index 5245a29..d2683fc 100644 --- a/src/distutils2/tests/test_install_lib.py +++ b/src/distutils2/tests/test_install_lib.py @@ -1,7 +1,7 @@ """Tests for distutils.command.install_data.""" import sys import os -import unittest +import unittest2 from distutils2.command.install_lib import install_lib from distutils2.extension import Extension @@ -11,7 +11,7 @@ from distutils2.errors import DistutilsOptionError class InstallLibTestCase(support.TempdirManager, support.LoggingSilencer, support.EnvironGuard, - unittest.TestCase): + unittest2.TestCase): def test_finalize_options(self): pkg_dir, dist = self.create_dist() @@ -31,7 +31,7 @@ class InstallLibTestCase(support.TempdirManager, cmd.finalize_options() self.assertEquals(cmd.optimize, 2) - @unittest.skipUnless(not sys.dont_write_bytecode, + @unittest2.skipUnless(not sys.dont_write_bytecode, 'byte-compile not supported') def test_byte_compile(self): pkg_dir, dist = self.create_dist() @@ -95,7 +95,7 @@ class InstallLibTestCase(support.TempdirManager, self.assertTrue('byte-compiling is disabled' in self.logs[0][1]) def test_suite(): - return unittest.makeSuite(InstallLibTestCase) + return unittest2.makeSuite(InstallLibTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_install_scripts.py b/src/distutils2/tests/test_install_scripts.py index 180a033..9ffd43f 100644 --- a/src/distutils2/tests/test_install_scripts.py +++ b/src/distutils2/tests/test_install_scripts.py @@ -1,7 +1,7 @@ """Tests for distutils.command.install_scripts.""" import os -import unittest +import unittest2 from distutils2.command.install_scripts import install_scripts from distutils2.core import Distribution @@ -11,7 +11,7 @@ from distutils2.tests import support class InstallScriptsTestCase(support.TempdirManager, support.LoggingSilencer, - unittest.TestCase): + unittest2.TestCase): def test_default_settings(self): dist = Distribution() @@ -73,7 +73,7 @@ class InstallScriptsTestCase(support.TempdirManager, def test_suite(): - return unittest.makeSuite(InstallScriptsTestCase) + return unittest2.makeSuite(InstallScriptsTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_msvc9compiler.py b/src/distutils2/tests/test_msvc9compiler.py index 2ef7060..327b3eb 100644 --- a/src/distutils2/tests/test_msvc9compiler.py +++ b/src/distutils2/tests/test_msvc9compiler.py @@ -1,6 +1,6 @@ """Tests for distutils.msvc9compiler.""" import sys -import unittest +import unittest2 import os from distutils2.errors import DistutilsPlatformError @@ -60,9 +60,9 @@ _CLEANED_MANIFEST = """\ </dependency> </assembly>""" -@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32") +@unittest2.skipUnless(sys.platform=="win32", "These tests are only for win32") class msvc9compilerTestCase(support.TempdirManager, - unittest.TestCase): + unittest2.TestCase): def test_no_compiler(self): # makes sure query_vcvarsall throws @@ -130,7 +130,7 @@ class msvc9compilerTestCase(support.TempdirManager, def test_suite(): - return unittest.makeSuite(msvc9compilerTestCase) + return unittest2.makeSuite(msvc9compilerTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_register.py b/src/distutils2/tests/test_register.py index a03c13a..7463587 100644 --- a/src/distutils2/tests/test_register.py +++ b/src/distutils2/tests/test_register.py @@ -2,7 +2,7 @@ # -*- encoding: utf8 -*- import sys import os -import unittest +import unittest2 import getpass import urllib2 import warnings @@ -251,7 +251,7 @@ class RegisterTestCase(PyPIRCCommandTestCase): self.assertEquals(len(w.warnings), 1) def test_suite(): - return unittest.makeSuite(RegisterTestCase) + return unittest2.makeSuite(RegisterTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_sdist.py b/src/distutils2/tests/test_sdist.py index 04d4124..3589285 100644 --- a/src/distutils2/tests/test_sdist.py +++ b/src/distutils2/tests/test_sdist.py @@ -1,6 +1,6 @@ """Tests for distutils.command.sdist.""" import os -import unittest +import unittest2 import shutil import zipfile import tarfile @@ -35,7 +35,10 @@ from distutils2.errors import DistutilsExecError, DistutilsOptionError from distutils2.spawn import find_executable from distutils2.tests import support from distutils2.log import WARN -from shutil import get_archive_formats +try: + from shutil import get_archive_formats +except ImportError: + from distutils2._backport.shutil import get_archive_formats SETUP_PY = """ from distutils.core import setup @@ -95,7 +98,7 @@ class SDistTestCase(PyPIRCCommandTestCase): cmd.warn = _warn return dist, cmd - @unittest.skipUnless(zlib, "requires zlib") + @unittest2.skipUnless(zlib, "requires zlib") def test_prune_file_list(self): # this test creates a package with some vcs dirs in it # and launch sdist to make sure they get pruned @@ -137,7 +140,7 @@ class SDistTestCase(PyPIRCCommandTestCase): # making sure everything has been pruned correctly self.assertEquals(len(content), 4) - @unittest.skipUnless(zlib, "requires zlib") + @unittest2.skipUnless(zlib, "requires zlib") def test_make_distribution(self): # check if tar and gzip are installed @@ -174,7 +177,7 @@ class SDistTestCase(PyPIRCCommandTestCase): self.assertEquals(result, ['fake-1.0.tar', 'fake-1.0.tar.gz']) - @unittest.skipUnless(zlib, "requires zlib") + @unittest2.skipUnless(zlib, "requires zlib") def test_add_defaults(self): # http://bugs.python.org/issue2279 @@ -236,7 +239,7 @@ class SDistTestCase(PyPIRCCommandTestCase): manifest = open(join(self.tmp_dir, 'MANIFEST')).read() self.assertEquals(manifest, MANIFEST % {'sep': os.sep}) - @unittest.skipUnless(zlib, "requires zlib") + @unittest2.skipUnless(zlib, "requires zlib") def test_metadata_check_option(self): # testing the `medata-check` option dist, cmd = self.get_cmd(metadata={}) @@ -296,8 +299,8 @@ class SDistTestCase(PyPIRCCommandTestCase): cmd.formats = 'supazipa' self.assertRaises(DistutilsOptionError, cmd.finalize_options) - @unittest.skipUnless(zlib, "requires zlib") - @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") + @unittest2.skipUnless(zlib, "requires zlib") + @unittest2.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") def test_make_distribution_owner_group(self): # check if tar and gzip are installed @@ -347,7 +350,7 @@ class SDistTestCase(PyPIRCCommandTestCase): archive.close() def test_suite(): - return unittest.makeSuite(SDistTestCase) + return unittest2.makeSuite(SDistTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_spawn.py b/src/distutils2/tests/test_spawn.py index 5cc1aa3..4e36416 100644 --- a/src/distutils2/tests/test_spawn.py +++ b/src/distutils2/tests/test_spawn.py @@ -1,5 +1,5 @@ """Tests for distutils.spawn.""" -import unittest +import unittest2 import os import time from test.test_support import captured_stdout @@ -11,7 +11,7 @@ from distutils2.tests import support class SpawnTestCase(support.TempdirManager, support.LoggingSilencer, - unittest.TestCase): + unittest2.TestCase): def test_nt_quote_args(self): @@ -23,7 +23,7 @@ class SpawnTestCase(support.TempdirManager, self.assertEquals(res, wanted) - @unittest.skipUnless(os.name in ('nt', 'posix'), + @unittest2.skipUnless(os.name in ('nt', 'posix'), 'Runs only under posix or nt') def test_spawn(self): tmpdir = self.mkdtemp() @@ -54,7 +54,7 @@ class SpawnTestCase(support.TempdirManager, spawn([exe]) # should work without any error def test_suite(): - return unittest.makeSuite(SpawnTestCase) + return unittest2.makeSuite(SpawnTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_sysconfig.py b/src/distutils2/tests/test_sysconfig.py deleted file mode 100644 index fe62011..0000000 --- a/src/distutils2/tests/test_sysconfig.py +++ /dev/null @@ -1,78 +0,0 @@ -"""Tests for distutils.sysconfig.""" -import os -import test -import unittest -import shutil - -from distutils2 import sysconfig -from distutils2.tests import support -from test.test_support import TESTFN - -class SysconfigTestCase(support.EnvironGuard, - unittest.TestCase): - def setUp(self): - super(SysconfigTestCase, self).setUp() - self.makefile = None - - def tearDown(self): - if self.makefile is not None: - os.unlink(self.makefile) - self.cleanup_testfn() - super(SysconfigTestCase, self).tearDown() - - def cleanup_testfn(self): - path = test.test_support.TESTFN - if os.path.isfile(path): - os.remove(path) - elif os.path.isdir(path): - shutil.rmtree(path) - - def test_get_python_lib(self): - lib_dir = sysconfig.get_python_lib() - # XXX doesn't work on Linux when Python was never installed before - #self.assertTrue(os.path.isdir(lib_dir), lib_dir) - # test for pythonxx.lib? - self.assertNotEqual(sysconfig.get_python_lib(), - sysconfig.get_python_lib(prefix=TESTFN)) - _sysconfig = __import__('sysconfig') - res = sysconfig.get_python_lib(True, True) - self.assertEquals(_sysconfig.get_path('platstdlib'), res) - - def test_get_python_inc(self): - inc_dir = sysconfig.get_python_inc() - # This is not much of a test. We make sure Python.h exists - # in the directory returned by get_python_inc() but we don't know - # it is the correct file. - self.assertTrue(os.path.isdir(inc_dir), inc_dir) - python_h = os.path.join(inc_dir, "Python.h") - self.assertTrue(os.path.isfile(python_h), python_h) - - def test_parse_makefile_base(self): - self.makefile = test.test_support.TESTFN - fd = open(self.makefile, 'w') - fd.write(r"CONFIG_ARGS= '--arg1=optarg1' 'ENV=LIB'" '\n') - fd.write('VAR=$OTHER\nOTHER=foo') - fd.close() - d = sysconfig.parse_makefile(self.makefile) - self.assertEquals(d, {'CONFIG_ARGS': "'--arg1=optarg1' 'ENV=LIB'", - 'OTHER': 'foo'}) - - def test_parse_makefile_literal_dollar(self): - self.makefile = test.test_support.TESTFN - fd = open(self.makefile, 'w') - fd.write(r"CONFIG_ARGS= '--arg1=optarg1' 'ENV=\$$LIB'" '\n') - fd.write('VAR=$OTHER\nOTHER=foo') - fd.close() - d = sysconfig.parse_makefile(self.makefile) - self.assertEquals(d, {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'", - 'OTHER': 'foo'}) - - -def test_suite(): - suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(SysconfigTestCase)) - return suite - - -if __name__ == '__main__': - test.test_support.run_unittest(test_suite()) diff --git a/src/distutils2/tests/test_text_file.py b/src/distutils2/tests/test_text_file.py index 0e12943..0c238f8 100644 --- a/src/distutils2/tests/test_text_file.py +++ b/src/distutils2/tests/test_text_file.py @@ -1,6 +1,6 @@ """Tests for distutils.text_file.""" import os -import unittest +import unittest2 from distutils2.text_file import TextFile from distutils2.tests import support @@ -11,7 +11,7 @@ line 3 \\ continues on next line """ -class TextFileTestCase(support.TempdirManager, unittest.TestCase): +class TextFileTestCase(support.TempdirManager, unittest2.TestCase): def test_class(self): # old tests moved from text_file.__main__ @@ -82,7 +82,7 @@ class TextFileTestCase(support.TempdirManager, unittest.TestCase): test_input (6, "join lines with collapsing", in_file, result6) def test_suite(): - return unittest.makeSuite(TextFileTestCase) + return unittest2.makeSuite(TextFileTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_unixccompiler.py b/src/distutils2/tests/test_unixccompiler.py index ef13ff2..921de8a 100644 --- a/src/distutils2/tests/test_unixccompiler.py +++ b/src/distutils2/tests/test_unixccompiler.py @@ -1,11 +1,15 @@ """Tests for distutils.unixccompiler.""" import sys -import unittest -import sysconfig +import unittest2 + +try: + import sysconfig +except ImportError: + from distutils2._backport import sysconfig from distutils2.unixccompiler import UnixCCompiler -class UnixCCompilerTestCase(unittest.TestCase): +class UnixCCompilerTestCase(unittest2.TestCase): def setUp(self): self._backup_platform = sys.platform @@ -123,7 +127,7 @@ class UnixCCompilerTestCase(unittest.TestCase): def test_suite(): - return unittest.makeSuite(UnixCCompilerTestCase) + return unittest2.makeSuite(UnixCCompilerTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_upload.py b/src/distutils2/tests/test_upload.py index 5f3f78d..d7fb3e9 100644 --- a/src/distutils2/tests/test_upload.py +++ b/src/distutils2/tests/test_upload.py @@ -2,7 +2,7 @@ # -*- encoding: utf8 -*- import sys import os -import unittest +import unittest2 from distutils2.command import upload as upload_mod from distutils2.command.upload import upload @@ -126,7 +126,7 @@ class uploadTestCase(PyPIRCCommandTestCase): self.assertFalse('\n' in auth) def test_suite(): - return unittest.makeSuite(uploadTestCase) + return unittest2.makeSuite(uploadTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_util.py b/src/distutils2/tests/test_util.py index ae77bc6..41e178a 100644 --- a/src/distutils2/tests/test_util.py +++ b/src/distutils2/tests/test_util.py @@ -1,12 +1,11 @@ """Tests for distutils.util.""" import os import sys -import unittest +import unittest2 from copy import copy from StringIO import StringIO import subprocess -from sysconfig import get_config_vars, get_platform from distutils2.errors import DistutilsPlatformError, DistutilsByteCompileError from distutils2.util import (convert_path, change_root, check_environ, split_quoted, strtobool, @@ -31,7 +30,7 @@ class FakePopen(object): self.stdout = StringIO(exes[self.cmd]) self.stderr = StringIO() -class UtilTestCase(support.EnvironGuard, unittest.TestCase): +class UtilTestCase(support.EnvironGuard, unittest2.TestCase): def setUp(self): super(UtilTestCase, self).setUp() @@ -90,13 +89,6 @@ class UtilTestCase(support.EnvironGuard, unittest.TestCase): def _get_uname(self): return self._uname - def test_get_platform(self): - platform = util.get_platform() - self.assertEquals(platform, get_platform()) - util.set_platform('MyOwnPlatform') - self.assertEquals('MyOwnPlatform', util.get_platform()) - util.set_platform(platform) - def test_convert_path(self): # linux/mac os.sep = '/' @@ -162,22 +154,6 @@ class UtilTestCase(support.EnvironGuard, unittest.TestCase): # XXX platforms to be covered: os2, mac - def test_check_environ(self): - util._environ_checked = 0 - if 'HOME' in os.environ: - del os.environ['HOME'] - - # posix without HOME - if os.name == 'posix': # this test won't run on windows - check_environ() - import pwd - self.assertEquals(os.environ['HOME'], pwd.getpwuid(os.getuid())[5]) - else: - check_environ() - - self.assertEquals(os.environ['PLAT'], get_platform()) - self.assertEquals(util._environ_checked, 1) - def test_split_quoted(self): self.assertEquals(split_quoted('""one"" "two" \'three\' \\four'), ['one', 'two', 'three', 'four']) @@ -274,7 +250,7 @@ class UtilTestCase(support.EnvironGuard, unittest.TestCase): sys.dont_write_bytecode = old_dont_write_bytecode def test_suite(): - return unittest.makeSuite(UtilTestCase) + return unittest2.makeSuite(UtilTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") diff --git a/src/distutils2/tests/test_version.py b/src/distutils2/tests/test_version.py index aa50fce..41278bd 100644 --- a/src/distutils2/tests/test_version.py +++ b/src/distutils2/tests/test_version.py @@ -1,9 +1,9 @@ """Tests for distutils.version.""" -import unittest +import unittest2 from distutils2.version import LooseVersion from distutils2.version import StrictVersion -class VersionTestCase(unittest.TestCase): +class VersionTestCase(unittest2.TestCase): def test_prerelease(self): version = StrictVersion('1.2.3a1') @@ -64,7 +64,7 @@ class VersionTestCase(unittest.TestCase): (v1, v2, wanted, res)) def test_suite(): - return unittest.makeSuite(VersionTestCase) + return unittest2.makeSuite(VersionTestCase) if __name__ == "__main__": - unittest.main(defaultTest="test_suite") + unittest2.main(defaultTest="test_suite") |