Author: Ronan Lamy <ronan.l...@gmail.com> Branch: py3k Changeset: r87598:fa2f1b9c84f4 Date: 2016-10-05 17:04 +0100 http://bitbucket.org/pypy/pypy/changeset/fa2f1b9c84f4/
Log: merge heads diff --git a/pypy/module/cpyext/test/test_memoryobject.py b/pypy/module/cpyext/test/test_memoryobject.py --- a/pypy/module/cpyext/test/test_memoryobject.py +++ b/pypy/module/cpyext/test/test_memoryobject.py @@ -60,9 +60,7 @@ return PyMemoryView_FromBuffer(&info); """)]) exc = raises(ValueError, module.fillinfo_NULL) - expected = ("cannot make memory view from a buffer with a NULL data " - "pointer") - assert str(exc.value) == expected + assert 'NULL' in str(exc.value) @pytest.mark.skipif(True, reason='write a test for this') def test_get_base_and_get_buffer(self, space, api): _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit