languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-08 20:20:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #8584. Fix the skipping of a number of tests due to incorrect importing.

Browse source 
This undoes a previous attempt to fix some of the skips. Value and copy
come from sharedctypes rather than plain ctypes, and the test skipping is
then done at the class level rather than test-by-test.

There are zero skipped tests after the fix.
This commit is contained in:
Brian Curtin 2010-10-07 01:12:19 +00:00
parent beb4135b8c
commit afa88b5dac
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Lib/test/test_multiprocessing.py
View file

@ -36,6 +36,12 @@
from multiprocessing import util
try:
from multiprocessing.sharedctypes import Value, copy
HAS_SHAREDCTYPES = True
except ImportError:
HAS_SHAREDCTYPES = False
#
#
#
@ -75,16 +81,6 @@ def latin(s):
Structure = object
c_int = c_double = None
try:
from ctypes import Value
except ImportError:
Value = None
try:
from ctypes import copy as ctypes_copy
except ImportError:
ctypes_copy = None
#
# Creates a wrapper for a function which records the time it takes to finish
#
@ -803,6 +799,8 @@ def test_event(self):
#
#
@unittest.skipUnless(HAS_SHAREDCTYPES,
"requires multiprocessing.sharedctypes")
class _TestValue(BaseTestCase):
ALLOWED_TYPES = ('processes',)
@ -819,7 +817,6 @@ def _test(self, values):
sv.value = cv[2]
@unittest.skipIf(c_int is None, "requires _ctypes")
def test_value(self, raw=False):
if raw:
values = [self.RawValue(code, value)
@ -838,11 +835,9 @@ def test_value(self, raw=False):
for sv, cv in zip(values, self.codes_values):
self.assertEqual(sv.value, cv[2])
@unittest.skipIf(c_int is None, "requires _ctypes")
def test_rawvalue(self):
self.test_value(raw=True)
@unittest.skipIf(c_int is None, "requires _ctypes")
def test_getobj_getlock(self):
val1 = self.Value('i', 5)
lock1 = val1.get_lock()
@ -1594,6 +1589,8 @@ class _Foo(Structure):
('y', c_double)
]
@unittest.skipUnless(HAS_SHAREDCTYPES,
"requires multiprocessing.sharedctypes")
class _TestSharedCTypes(BaseTestCase):
ALLOWED_TYPES = ('processes',)
@ -1607,14 +1604,13 @@ def _double(self, x, y, foo, arr, string):
for i in range(len(arr)):
arr[i] *= 2
@unittest.skipIf(Value is None, "requires ctypes.Value")
def test_sharedctypes(self, lock=False):
x = Value('i', 7, lock=lock)
y = Value(c_double, 1.0/3.0, lock=lock)
foo = Value(_Foo, 3, 2, lock=lock)
arr = self.Array('d', list(range(10)), lock=lock)
string = self.Array('c', 20, lock=lock)
string.value = 'hello'
string.value = latin('hello')
p = self.Process(target=self._double, args=(x, y, foo, arr, string))
p.start()
@ -1628,14 +1624,12 @@ def test_sharedctypes(self, lock=False):
self.assertAlmostEqual(arr[i], i*2)
self.assertEqual(string.value, latin('hellohello'))
@unittest.skipIf(Value is None, "requires ctypes.Value")
def test_synchronize(self):
self.test_sharedctypes(lock=True)
@unittest.skipIf(ctypes_copy is None, "requires ctypes.copy")
def test_copy(self):
foo = _Foo(2, 5.0)
bar = ctypes_copy(foo)
bar = copy(foo)
foo.x = 0
foo.y = 0
self.assertEqual(bar.x, 2)