[pypy-commit] pypy cpyext-ext: fix tests
mattip
pypy.commits at gmail.com
Thu Jun 2 00:40:58 EDT 2016
Author: Matti Picus <matti.picus at gmail.com>
Branch: cpyext-ext
Changeset: r84874:5b5631d70988
Date: 2016-06-02 07:39 +0300
http://bitbucket.org/pypy/pypy/changeset/5b5631d70988/
Log: fix tests
diff --git a/pypy/module/cpyext/test/test_bytearrayobject.py b/pypy/module/cpyext/test/test_bytearrayobject.py
--- a/pypy/module/cpyext/test/test_bytearrayobject.py
+++ b/pypy/module/cpyext/test/test_bytearrayobject.py
@@ -63,7 +63,10 @@
Py_DECREF(t);
c = PyByteArray_AsString(s);
if (c == NULL)
- return NULL;
+ {
+ PyErr_SetString(PyExc_ValueError, "non-null bytearray object expected");
+ return NULL;
+ }
c[0] = 'a';
c[1] = 'b';
c[2] = 0;
@@ -80,13 +83,11 @@
("mutable", "METH_NOARGS",
"""
PyObject *base;
- PyObject *obj;
char * p_str;
base = PyByteArray_FromStringAndSize("test", 10);
if (PyByteArray_GET_SIZE(base) != 10)
return PyLong_FromLong(-PyByteArray_GET_SIZE(base));
- obj = (PyByteArrayObject*)base;
- memcpy(PyByteArray_AS_STRING(obj), "works", 6);
+ memcpy(PyByteArray_AS_STRING(base), "works", 6);
Py_INCREF(base);
return base;
"""),
More information about the pypy-commit
mailing list