Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Lib/test/test_bytes.py
Original file line number Diff line number Diff line change
Expand Up @@ -1569,6 +1569,7 @@ def test_resize(self):
self.assertRaises(MemoryError, bytearray().resize, sys.maxsize)
self.assertRaises(MemoryError, bytearray(1000).resize, sys.maxsize)

@support.nomemtest
def test_resize_error(self):
# gh-157242: If bytearray.resize() fails (MemoryError),
# the bytearray must be left unchanged.
Expand Down Expand Up @@ -1662,6 +1663,7 @@ def test_take_bytes(self):
self.assertEqual(ba, bytearray(b'A'))
self.assertEqual(ord(b'c'), ord('c'))

@support.nomemtest
def test_take_bytes_error(self):
# gh-157242: If bytearray.take_bytes() fails (MemoryError),
# the bytearray must be left unchanged.
Expand Down
6 changes: 6 additions & 0 deletions Lib/test/test_capi/test_bytes.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import sys
import unittest
from test import support
from test.support import import_helper

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

@support.nomemtest
def test_resize_error(self):
small_buffer = _testcapi.PyBytesWriter_small_buffer
init = b'x' * (small_buffer * 2)
Expand Down Expand Up @@ -464,6 +466,10 @@ def test_example_resize(self):
def test_example_highlevel(self):
self.assertEqual(_testcapi.byteswriter_highlevel(), b'Hello World!')

@support.nomemtest
def test_bytes_resize_tracer(self):
_testcapi._test_bytes_resize_tracer()


class ByteArrayWriterTest(BaseWriterTest, unittest.TestCase):
result_type = bytearray
Expand Down
4 changes: 2 additions & 2 deletions Modules/_testcapi/mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ check_bytes_resize_tracer(int no_memory)


static PyObject*
test_bytes_resize_tracer(PyObject *self, PyObject *Py_UNUSED(ignored))
_test_bytes_resize_tracer(PyObject *self, PyObject *Py_UNUSED(ignored))
{
if (check_bytes_resize_tracer(0) < 0) {
return NULL;
Expand Down Expand Up @@ -972,7 +972,7 @@ static PyMethodDef test_methods[] = {
#if TARGET_OS_OSX || defined(__FreeBSD__)
{"get_process_memory_usage", get_process_memory_usage, METH_VARARGS},
#endif
{"test_bytes_resize_tracer", test_bytes_resize_tracer, METH_NOARGS},
{"_test_bytes_resize_tracer", _test_bytes_resize_tracer, METH_NOARGS},

// Tracemalloc tests
{"tracemalloc_track", tracemalloc_track, METH_VARARGS},
Expand Down
Loading