1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Merge 3.2) Close #12230: Mac OS X Tiger (10.4) has a kernel bug: sometimes,

Browse Source 
the file descriptor of a pipe closed in the parent process is valid in the
child process according to fstat(), but the mode of the file descriptor is
invalid, and read or write raise an error.

test.support.requires_mac_ver() is now a decorator, as suggested by Ezio
Melotti, and its docstring is fixed (linux_version => mac_ver).
This commit is contained in:
Victor Stinner 2011-06-01 13:19:07 +02:00
commit ebbbdafd87
3 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Lib/test/support.py
View File

@ -301,23 +301,32 @@ def linux_version():
return 0, 0, 0 return 0, 0, 0
def requires_mac_ver(*min_version): def requires_mac_ver(*min_version):
"""Raise SkipTest if the OS is Mac OS X and the OS X version if less than """Decorator raising SkipTest if the OS is Mac OS X and the OS X
min_version. version if less than min_version.
For example, support.requires_linux_version(10, 5) raises SkipTest if the For example, @requires_mac_ver(10, 5) raises SkipTest if the OS X version
version is less than 10.5. is lesser than 10.5.
""" """
if sys.platform != 'darwin': def decorator(func):
return @functools.wraps(func)
def wrapper(*args, **kw):
if sys.platform == 'darwin':
version_txt = platform.mac_ver()[0] version_txt = platform.mac_ver()[0]
try: try:
version = tuple(map(int, version_txt.split('.'))) version = tuple(map(int, version_txt.split('.')))
except ValueError: except ValueError:
return pass
else:
if version < min_version: if version < min_version:
min_version_txt = '.'.join(map(str, min_version)) min_version_txt = '.'.join(map(str, min_version))
raise unittest.SkipTest("Mac OS X %s or higher required, not %s" raise unittest.SkipTest(
"Mac OS X %s or higher required, not %s"
% (min_version_txt, version_txt)) % (min_version_txt, version_txt))
return func(*args, **kw)
wrapper.min_version = min_version
return wrapper
return decorator
HOST = 'localhost' HOST = 'localhost'

5
Lib/test/test_math.py
View File

@ -670,10 +670,9 @@ class MathTests(unittest.TestCase):
self.assertTrue(math.isnan(math.log2(NAN))) self.assertTrue(math.isnan(math.log2(NAN)))
@requires_IEEE_754 @requires_IEEE_754
def testLog2Exact(self):
# log2() is not accurate enough on Mac OS X Tiger (10.4) # log2() is not accurate enough on Mac OS X Tiger (10.4)
support.requires_mac_ver(10, 5) @support.requires_mac_ver(10, 5)
def testLog2Exact(self):
# Check that we get exact equality for log2 of powers of 2. # Check that we get exact equality for log2 of powers of 2.
actual = [math.log2(math.ldexp(1.0, n)) for n in range(-1074, 1024)] actual = [math.log2(math.ldexp(1.0, n)) for n in range(-1074, 1024)]
expected = [float(n) for n in range(-1074, 1024)] expected = [float(n) for n in range(-1074, 1024)]

5
Lib/test/test_subprocess.py
View File

@ -1281,6 +1281,11 @@ class POSIXProcessTestCase(BaseTestCase):
"Some fds were left open") "Some fds were left open")
self.assertIn(1, remaining_fds, "Subprocess failed") self.assertIn(1, remaining_fds, "Subprocess failed")
# Mac OS X Tiger (10.4) has a kernel bug: sometimes, the file
# descriptor of a pipe closed in the parent process is valid in the
# child process according to fstat(), but the mode of the file
# descriptor is invalid, and read or write raise an error.
@support.requires_mac_ver(10, 5)
def test_pass_fds(self): def test_pass_fds(self):
fd_status = support.findfile("fd_status.py", subdir="subprocessdata") fd_status = support.findfile("fd_status.py", subdir="subprocessdata")