[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2

Sat Aug 20 20:02:35 CEST 2011

http://hg.python.org/cpython/rev/9d1457438db2
changeset: 71994:9d1457438db2
parent: 71966:40f4a3d6a532
parent: 71993:c26a7be878fe
user: Éric Araujo <merwok at netwok.org>
date: Sat Aug 20 07:10:54 2011 +0200
summary:
 Merge 3.2
files:
 Lib/distutils/tests/support.py | 42 +++++++++++
 Lib/distutils/tests/test_build_ext.py | 28 +------
 Lib/distutils/tests/test_install.py | 57 ++++++++++++--
 3 files changed, 92 insertions(+), 35 deletions(-)

diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
--- a/Lib/distutils/tests/support.py
+++ b/Lib/distutils/tests/support.py
@@ -2,12 +2,15 @@
 import os
 import shutil
 import tempfile
+import unittest
+import sysconfig
 from copy import deepcopy
 
 from distutils import log
 from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
 from distutils.core import Distribution
 
+
 class LoggingSilencer(object):
 
 def setUp(self):
@@ -41,6 +44,7 @@
 def clear_logs(self):
 self.logs = []
 
+
 class TempdirManager(object):
 """Mix-in class that handles temporary directories for test cases.
 
@@ -97,6 +101,7 @@
 
 return pkg_dir, dist
 
+
 class DummyCommand:
 """Class to store options for retrieval via set_undefined_options()."""
 
@@ -107,6 +112,7 @@
 def ensure_finalized(self):
 pass
 
+
 class EnvironGuard(object):
 
 def setUp(self):
@@ -123,3 +129,39 @@
 del os.environ[key]
 
 super(EnvironGuard, self).tearDown()
+
+
+def copy_xxmodule_c(directory):
+ """Helper for tests that need the xxmodule.c source file.
+
+ Example use:
+
+ def test_compile(self):
+ copy_xxmodule_c(self.tmpdir)
+ self.assertIn('xxmodule.c', os.listdir(self.tmpdir)
+
+ If the source file can be found, it will be copied to *directory*. If not,
+ the test will be skipped. Errors during copy are not caught.
+ """
+ filename = _get_xxmodule_path()
+ if filename is None:
+ raise unittest.SkipTest('cannot find xxmodule.c (test must run in '
+ 'the python build dir)')
+ shutil.copy(filename, directory)
+
+
+def _get_xxmodule_path():
+ srcdir = sysconfig.get_config_var('srcdir')
+ candidates = [
+ # use installed copy if available
+ os.path.join(os.path.dirname(__file__), 'xxmodule.c'),
+ # otherwise try using copy from build directory
+ os.path.join(srcdir, 'Modules', 'xxmodule.c'),
+ # srcdir mysteriously can be $srcdir/Lib/distutils/tests when
+ # this file is run from its parent directory, so walk up the
+ # tree to find the real srcdir
+ os.path.join(srcdir, '..', '..', '..', 'Modules', 'xxmodule.c'),
+ ]
+ for path in candidates:
+ if os.path.exists(path):
+ return path
diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -1,14 +1,13 @@
 import sys
 import os
-import shutil
 from io import StringIO
 import textwrap
 
 from distutils.core import Distribution
 from distutils.command.build_ext import build_ext
 from distutils import sysconfig
-from distutils.tests.support import TempdirManager
-from distutils.tests.support import LoggingSilencer
+from distutils.tests.support import (TempdirManager, LoggingSilencer,
+ copy_xxmodule_c)
 from distutils.extension import Extension
 from distutils.errors import (
 CompileError, DistutilsPlatformError, DistutilsSetupError,
@@ -16,20 +15,11 @@
 
 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.
 ALREADY_TESTED = False
 
-def _get_source_filename():
- # use installed copy if available
- tests_f = os.path.join(os.path.dirname(__file__), 'xxmodule.c')
- if os.path.exists(tests_f):
- return tests_f
- # otherwise try using copy from build directory
- srcdir = sysconfig.get_config_var('srcdir')
- return os.path.join(srcdir, 'Modules', 'xxmodule.c')
 
 class BuildExtTestCase(TempdirManager,
 LoggingSilencer,
@@ -41,9 +31,6 @@
 self.tmp_dir = self.mkdtemp()
 self.sys_path = sys.path, sys.path[:]
 sys.path.append(self.tmp_dir)
- filename = _get_source_filename()
- if os.path.exists(filename):
- shutil.copy(filename, self.tmp_dir)
 if sys.version > "2.6":
 import site
 self.old_user_base = site.USER_BASE
@@ -72,9 +59,8 @@
 
 def test_build_ext(self):
 global ALREADY_TESTED
+ copy_xxmodule_c(self.tmp_dir)
 xx_c = os.path.join(self.tmp_dir, 'xxmodule.c')
- if not os.path.exists(xx_c):
- return
 xx_ext = Extension('xx', [xx_c])
 dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
 dist.package_dir = self.tmp_dir
@@ -518,13 +504,7 @@
 
 
 def test_suite():
- src = _get_source_filename()
- if not os.path.exists(src):
- if 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 unittest.makeSuite(BuildExtTestCase)
 
 if __name__ == '__main__':
 support.run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py
--- a/Lib/distutils/tests/test_install.py
+++ b/Lib/distutils/tests/test_install.py
@@ -1,18 +1,20 @@
 """Tests for distutils.command.install."""
 
 import os
-import os.path
 import sys
 import unittest
 import site
 
 from test.support import captured_stdout, run_unittest
 
+from distutils import sysconfig
 from distutils.command.install import install
 from distutils.command import install as install_module
+from distutils.command.build_ext import build_ext
 from distutils.command.install import INSTALL_SCHEMES
 from distutils.core import Distribution
 from distutils.errors import DistutilsOptionError
+from distutils.extension import Extension
 
 from distutils.tests import support
 
@@ -167,33 +169,66 @@
 self.assertRaises(DistutilsOptionError, cmd.finalize_options)
 
 def test_record(self):
+ install_dir = self.mkdtemp()
+ project_dir, dist = self.create_dist(scripts=['hello'])
+ self.addCleanup(os.chdir, os.getcwd())
+ os.chdir(project_dir)
+ self.write_file('hello', "print('o hai')")
 
- install_dir = self.mkdtemp()
- pkgdir, dist = self.create_dist()
-
- dist = Distribution()
 cmd = install(dist)
 dist.command_obj['install'] = cmd
 cmd.root = install_dir
- cmd.record = os.path.join(pkgdir, 'RECORD')
+ cmd.record = os.path.join(project_dir, 'RECORD')
 cmd.ensure_finalized()
-
 cmd.run()
 
- # let's check the RECORD file was created with one
- # line (the egg info file)
 f = open(cmd.record)
 try:
- self.assertEqual(len(f.readlines()), 1)
+ content = f.read()
 finally:
 f.close()
 
+ found = [os.path.basename(line) for line in content.splitlines()]
+ expected = ['hello',
+ 'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
+ self.assertEqual(found, expected)
+
+ def test_record_extensions(self):
+ install_dir = self.mkdtemp()
+ project_dir, dist = self.create_dist(ext_modules=[
+ Extension('xx', ['xxmodule.c'])])
+ self.addCleanup(os.chdir, os.getcwd())
+ os.chdir(project_dir)
+ support.copy_xxmodule_c(project_dir)
+
+ buildcmd = build_ext(dist)
+ buildcmd.ensure_finalized()
+ buildcmd.run()
+
+ cmd = install(dist)
+ dist.command_obj['install'] = cmd
+ cmd.root = install_dir
+ cmd.record = os.path.join(project_dir, 'RECORD')
+ cmd.ensure_finalized()
+ cmd.run()
+
+ f = open(cmd.record)
+ try:
+ content = f.read()
+ finally:
+ f.close()
+
+ found = [os.path.basename(line) for line in content.splitlines()]
+ expected = ['xx%s' % sysconfig.get_config_var('SO'),
+ 'UNKNOWN-0.0.0-py%s.%s.egg-info' % sys.version_info[:2]]
+ self.assertEqual(found, expected)
+
 def test_debug_mode(self):
 # this covers the code called when DEBUG is set
 old_logs_len = len(self.logs)
 install_module.DEBUG = True
 try:
- with captured_stdout() as stdout:
+ with captured_stdout():
 self.test_record()
 finally:
 install_module.DEBUG = False
-- 
Repository URL: http://hg.python.org/cpython
