Commit ce2af335 authored by Benjamin Peterson's avatar Benjamin Peterson

merge 3.2

parents d3a345a2 b870aa12
...@@ -13,11 +13,7 @@ import sysconfig ...@@ -13,11 +13,7 @@ import sysconfig
import warnings import warnings
import select import select
import shutil import shutil
try: import gc
import gc
except ImportError:
gc = None
try: try:
import resource import resource
...@@ -951,7 +947,6 @@ class POSIXProcessTestCase(BaseTestCase): ...@@ -951,7 +947,6 @@ class POSIXProcessTestCase(BaseTestCase):
self.fail("Exception raised by preexec_fn did not make it " self.fail("Exception raised by preexec_fn did not make it "
"to the parent process.") "to the parent process.")
@unittest.skipUnless(gc, "Requires a gc module.")
def test_preexec_gc_module_failure(self): def test_preexec_gc_module_failure(self):
# This tests the code that disables garbage collection if the child # This tests the code that disables garbage collection if the child
# process will execute any Python. # process will execute any Python.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment