Skip to content

Commit b776d46

Browse files
committed
gh-157242: Fix test_capi on Py_TRACE_REFS build
Mark tests using set_nomemory() with @support.nomemtest to skip these tests on a Py_TRACE_REFS build.
1 parent 67e6be7 commit b776d46

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

Lib/test/test_bytes.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,6 +1569,7 @@ def test_resize(self):
15691569
self.assertRaises(MemoryError, bytearray().resize, sys.maxsize)
15701570
self.assertRaises(MemoryError, bytearray(1000).resize, sys.maxsize)
15711571

1572+
@support.nomemtest
15721573
def test_resize_error(self):
15731574
# gh-157242: If bytearray.resize() fails (MemoryError),
15741575
# the bytearray must be left unchanged.
@@ -1662,6 +1663,7 @@ def test_take_bytes(self):
16621663
self.assertEqual(ba, bytearray(b'A'))
16631664
self.assertEqual(ord(b'c'), ord('c'))
16641665

1666+
@support.nomemtest
16651667
def test_take_bytes_error(self):
16661668
# gh-157242: If bytearray.take_bytes() fails (MemoryError),
16671669
# the bytearray must be left unchanged.

Lib/test/test_capi/test_bytes.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import sys
22
import unittest
3+
from test import support
34
from test.support import import_helper
45

56
_testlimitedcapi = import_helper.import_module('_testlimitedcapi')
@@ -389,6 +390,7 @@ def test_resize(self):
389390
writer.resize(len(b'number=123456'), b'456')
390391
self.assertEqual(writer.finish(), self.result_type(b'number=123456'))
391392

393+
@support.nomemtest
392394
def test_resize_error(self):
393395
small_buffer = _testcapi.PyBytesWriter_small_buffer
394396
init = b'x' * (small_buffer * 2)
@@ -464,6 +466,10 @@ def test_example_resize(self):
464466
def test_example_highlevel(self):
465467
self.assertEqual(_testcapi.byteswriter_highlevel(), b'Hello World!')
466468

469+
@support.nomemtest
470+
def test_bytes_resize_tracer(self):
471+
_testcapi._test_bytes_resize_tracer()
472+
467473

468474
class ByteArrayWriterTest(BaseWriterTest, unittest.TestCase):
469475
result_type = bytearray

Modules/_testcapi/mem.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ check_bytes_resize_tracer(int no_memory)
943943

944944

945945
static PyObject*
946-
test_bytes_resize_tracer(PyObject *self, PyObject *Py_UNUSED(ignored))
946+
_test_bytes_resize_tracer(PyObject *self, PyObject *Py_UNUSED(ignored))
947947
{
948948
if (check_bytes_resize_tracer(0) < 0) {
949949
return NULL;
@@ -972,7 +972,7 @@ static PyMethodDef test_methods[] = {
972972
#if TARGET_OS_OSX || defined(__FreeBSD__)
973973
{"get_process_memory_usage", get_process_memory_usage, METH_VARARGS},
974974
#endif
975-
{"test_bytes_resize_tracer", test_bytes_resize_tracer, METH_NOARGS},
975+
{"_test_bytes_resize_tracer", _test_bytes_resize_tracer, METH_NOARGS},
976976

977977
// Tracemalloc tests
978978
{"tracemalloc_track", tracemalloc_track, METH_VARARGS},

0 commit comments

Comments
 (0)