]> granicus.if.org Git - python/commitdiff
Merged revisions 86694 via svnmerge from
authorAntoine Pitrou <solipsis@pitrou.net>
Mon, 22 Nov 2010 16:33:23 +0000 (16:33 +0000)
committerAntoine Pitrou <solipsis@pitrou.net>
Mon, 22 Nov 2010 16:33:23 +0000 (16:33 +0000)
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
........

Lib/test/test_multiprocessing.py

index 52f76acff8e88209bc7cdebd93a0df28e3a11188..aa0e1d8ba7d73fd0733088bfa1e4df8849732304 100644 (file)
@@ -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