summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-12-10 17:44:37 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-12-10 17:44:37 (GMT)
commitce2af335622a1371481fe7f410819d9df9f2ef5d (patch)
tree288f1e3bb500f99ed2fa61e301345efda36cb319
parentd3a345a21f4e07469622d148308637f0d5e69cf5 (diff)
parentb870aa1255bd24292d5110da5f7bedcefebdaa92 (diff)
downloadcpython-ce2af335622a1371481fe7f410819d9df9f2ef5d.zip
cpython-ce2af335622a1371481fe7f410819d9df9f2ef5d.tar.gz
cpython-ce2af335622a1371481fe7f410819d9df9f2ef5d.tar.bz2
merge 3.2
-rw-r--r--Lib/test/test_subprocess.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index d263b5f..6c22901 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -13,11 +13,7 @@ import sysconfig
import warnings
import select
import shutil
-try:
- import gc
-except ImportError:
- gc = None
-
+import gc
try:
import resource
@@ -951,7 +947,6 @@ class POSIXProcessTestCase(BaseTestCase):
self.fail("Exception raised by preexec_fn did not make it "
"to the parent process.")
- @unittest.skipUnless(gc, "Requires a gc module.")
def test_preexec_gc_module_failure(self):
# This tests the code that disables garbage collection if the child
# process will execute any Python.