summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-11-22 16:33:23 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-11-22 16:33:23 (GMT)
commit72d5a9d192b83f8bcd08f1507fac93d5768317e8 (patch)
tree86d7bc17e5edc4db6f08a56a569136cd2fff11e0 /Lib
parent7157d339296282bf3c2ae896e82f0a25e7c62ced (diff)
downloadcpython-72d5a9d192b83f8bcd08f1507fac93d5768317e8.zip
cpython-72d5a9d192b83f8bcd08f1507fac93d5768317e8.tar.gz
cpython-72d5a9d192b83f8bcd08f1507fac93d5768317e8.tar.bz2
Merged revisions 86694 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86694 | antoine.pitrou | 2010-11-22 17:26:21 +0100 (lun., 22 nov. 2010) | 3 lines Fix test_multiprocessing when ctypes isn't available ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_multiprocessing.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 52f76ac..aa0e1d8 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -812,8 +812,6 @@ class _TestEvent(BaseTestCase):
#
#
-@unittest.skipUnless(HAS_SHAREDCTYPES,
- "requires multiprocessing.sharedctypes")
class _TestValue(BaseTestCase):
ALLOWED_TYPES = ('processes',)
@@ -825,6 +823,10 @@ class _TestValue(BaseTestCase):
('c', latin('x'), latin('y'))
]
+ def setUp(self):
+ if not HAS_SHAREDCTYPES:
+ self.skipTest("requires multiprocessing.sharedctypes")
+
@classmethod
def _test(cls, values):
for sv, cv in zip(values, cls.codes_values):
@@ -1580,12 +1582,14 @@ class _Foo(Structure):
('y', c_double)
]
-@unittest.skipUnless(HAS_SHAREDCTYPES,
- "requires multiprocessing.sharedctypes")
class _TestSharedCTypes(BaseTestCase):
ALLOWED_TYPES = ('processes',)
+ def setUp(self):
+ if not HAS_SHAREDCTYPES:
+ self.skipTest("requires multiprocessing.sharedctypes")
+
@classmethod
def _double(cls, x, y, foo, arr, string):
x.value *= 2