summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2019-04-12 13:15:04 (GMT)
committerGitHub <noreply@github.com>2019-04-12 13:15:04 (GMT)
commit9b8314cfe29ca532fc335277f6c36b72e6132922 (patch)
treea16a8655672669faa2858edac59f719bbf53c3b3 /Lib
parent9e4f2f3a6b8ee995c365e86d976937c141d867f8 (diff)
downloadcpython-9b8314cfe29ca532fc335277f6c36b72e6132922.zip
cpython-9b8314cfe29ca532fc335277f6c36b72e6132922.tar.gz
cpython-9b8314cfe29ca532fc335277f6c36b72e6132922.tar.bz2
bpo-36611: Fix test_sys.test_getallocatedblocks() (GH-12797)
Fix test_sys.test_getallocatedblocks() when tracemalloc is enabled. If the name of Python memory allocators cannot get read, consider that pymalloc is disabled. Fix the following error: ./python -X tracemalloc -m test test_sys -v -m test_getallocatedblocks ERROR: test_getallocatedblocks (test.test_sys.SysModuleTest) ------------------------------------------------------------ Traceback (most recent call last): File "Lib/test/test_sys.py", line 770, in test_getallocatedblocks alloc_name = _testcapi.pymem_getallocatorsname() RuntimeError: cannot get allocators name
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_sys.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 4bd54af..d1c7daa 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -767,8 +767,13 @@ class SysModuleTest(unittest.TestCase):
except ImportError:
with_pymalloc = support.with_pymalloc()
else:
- alloc_name = _testcapi.pymem_getallocatorsname()
- with_pymalloc = (alloc_name in ('pymalloc', 'pymalloc_debug'))
+ try:
+ alloc_name = _testcapi.pymem_getallocatorsname()
+ except RuntimeError as exc:
+ # "cannot get allocators name" (ex: tracemalloc is used)
+ with_pymalloc = True
+ else:
+ with_pymalloc = (alloc_name in ('pymalloc', 'pymalloc_debug'))
# Some sanity checks
a = sys.getallocatedblocks()