summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-12-10 17:31:42 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-12-10 17:31:42 (GMT)
commit964561bb7cbfd7ef48b8874b32e26ece9a68f6cd (patch)
tree3253263f5f53cf4b6e2ab550023a5e3065be2619 /Lib/test
parent13859bfedc77a54adfc7bab75573fd330438587a (diff)
downloadcpython-964561bb7cbfd7ef48b8874b32e26ece9a68f6cd.zip
cpython-964561bb7cbfd7ef48b8874b32e26ece9a68f6cd.tar.gz
cpython-964561bb7cbfd7ef48b8874b32e26ece9a68f6cd.tar.bz2
you can't get resource.error if you can't import resource
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_subprocess.py28
1 files changed, 17 insertions, 11 deletions
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index ff76ec4..c3eae9a 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -18,6 +18,12 @@ try:
except ImportError:
gc = None
+
+try:
+ import resource
+except ImportError:
+ resource = None
+
mswindows = (sys.platform == "win32")
#
@@ -732,12 +738,12 @@ class _SuppressCoreFiles(object):
def __enter__(self):
"""Try to save previous ulimit, then set it to (0, 0)."""
- try:
- import resource
- self.old_limit = resource.getrlimit(resource.RLIMIT_CORE)
- resource.setrlimit(resource.RLIMIT_CORE, (0, 0))
- except (ImportError, ValueError, resource.error):
- pass
+ if resource is not None:
+ try:
+ self.old_limit = resource.getrlimit(resource.RLIMIT_CORE)
+ resource.setrlimit(resource.RLIMIT_CORE, (0, 0))
+ except (ValueError, resource.error):
+ pass
if sys.platform == 'darwin':
# Check if the 'Crash Reporter' on OSX was configured
@@ -758,11 +764,11 @@ class _SuppressCoreFiles(object):
"""Return core file behavior to default."""
if self.old_limit is None:
return
- try:
- import resource
- resource.setrlimit(resource.RLIMIT_CORE, self.old_limit)
- except (ImportError, ValueError, resource.error):
- pass
+ if resource is not None:
+ try:
+ resource.setrlimit(resource.RLIMIT_CORE, self.old_limit)
+ except (ValueError, resource.error):
+ pass
@unittest.skipIf(mswindows, "POSIX specific tests")