Author: Matti Picus <matti.pi...@gmail.com> Branch: cpyext-ext Changeset: r83979:460c0e1dc5ef Date: 2016-04-27 13:00 +0300 http://bitbucket.org/pypy/pypy/changeset/460c0e1dc5ef/
Log: revert skipped tests from merge diff --git a/pypy/module/cpyext/test/test_getargs.py b/pypy/module/cpyext/test/test_getargs.py --- a/pypy/module/cpyext/test/test_getargs.py +++ b/pypy/module/cpyext/test/test_getargs.py @@ -123,7 +123,6 @@ return result; ''') assert 'foo\0bar\0baz' == pybuffer('foo\0bar\0baz') - skip('PyByteArrayObject not implemented yet') assert 'foo\0bar\0baz' == pybuffer(bytearray('foo\0bar\0baz')) diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py --- a/pypy/module/cpyext/test/test_typeobject.py +++ b/pypy/module/cpyext/test/test_typeobject.py @@ -4,7 +4,6 @@ from pypy.module.cpyext.pyobject import make_ref, from_ref from pypy.module.cpyext.typeobject import PyTypeObjectPtr -import pytest import sys class AppTestTypeObject(AppTestCpythonExtensionBase): @@ -123,7 +122,6 @@ obj = module.fooType.classmeth() assert obj is module.fooType - @pytest.mark.skipif('__pypy__' not in sys.builtin_module_names, reason='cpython segfaults') def test_new(self): # XXX cpython segfaults but if run singly (with -k test_new) this passes module = self.import_module(name='foo') @@ -178,8 +176,6 @@ x = module.MetaType('name', (), {}) assert isinstance(x, type) assert isinstance(x, module.MetaType) - if self.runappdirect and '__pypy__' in sys.builtin_module_names: - skip('x is not callable when runappdirect??') x() def test_metaclass_compatible(self): @@ -189,17 +185,15 @@ assert type(module.fooType).__mro__ == (type, object) y = module.MetaType('other', (module.MetaType,), {}) assert isinstance(y, module.MetaType) - if self.runappdirect and '__pypy__' in sys.builtin_module_names: - skip('y is not callable when runappdirect??') x = y('something', (type(y),), {}) del x, y def test_metaclass_compatible2(self): - skip('type.__new__ does not check acceptable_as_base_class') # XXX FIX - must raise since fooType (which is a base type) # does not have flag Py_TPFLAGS_BASETYPE module = self.import_module(name='foo') raises(TypeError, module.MetaType, 'other', (module.fooType,), {}) + def test_sre(self): import sys for m in ['_sre', 'sre_compile', 'sre_constants', 'sre_parse', 're']: @@ -891,7 +885,6 @@ #print('calling module.footype()...') module.footype("X", (object,), {}) - @pytest.mark.skipif('__pypy__' not in sys.builtin_module_names, reason='cpython fails') def test_app_subclass_of_c_type(self): # on cpython, the size changes (6 bytes added) module = self.import_module(name='foo') _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit