diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/base/test_utils.py | 8 | ||||
| -rw-r--r-- | test/engine/test_processors.py | 4 | ||||
| -rw-r--r-- | test/requirements.py | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/test/base/test_utils.py b/test/base/test_utils.py index 19b3aa357..4a53aa54f 100644 --- a/test/base/test_utils.py +++ b/test/base/test_utils.py @@ -1393,7 +1393,7 @@ class ArgInspectionTest(fixtures.TestBase): (['self', 'x', 'y'], None, 'kw', None) ) - @fails_if(lambda: util.pypy, "pypy inspects datetime.now correctly") + @fails_if(lambda: util.pypy, "pypy returns plain *arg, **kw") def test_callable_argspec_py_builtin(self): import datetime assert_raises( @@ -1401,6 +1401,7 @@ class ArgInspectionTest(fixtures.TestBase): get_callable_argspec, datetime.datetime.now ) + @fails_if(lambda: util.pypy, "pypy returns plain *arg, **kw") def test_callable_argspec_obj_init(self): assert_raises( TypeError, @@ -1472,6 +1473,7 @@ class ArgInspectionTest(fixtures.TestBase): (['x', 'y'], None, None, None) ) + @fails_if(lambda: util.pypy, "pypy returns plain *arg, **kw") def test_callable_argspec_partial(self): from functools import partial def foo(x, y, z, **kw): @@ -1600,6 +1602,8 @@ class TestFormatArgspec(fixtures.TestBase): 'apply_kw': 'a=a, b=b', 'apply_pos': 'a, b'}, grouped=False) + @testing.fails_if(lambda: util.pypy, + "pypy doesn't report O.__init__ as object.__init__") def test_init_grouped(self): object_spec = { 'args': '(self)', 'self_arg': 'self', @@ -1615,6 +1619,8 @@ class TestFormatArgspec(fixtures.TestBase): self._test_init(None, object_spec, wrapper_spec, custom_spec) self._test_init(True, object_spec, wrapper_spec, custom_spec) + @testing.fails_if(lambda: util.pypy, + "pypy doesn't report O.__init__ as object.__init__") def test_init_bare(self): object_spec = { 'args': 'self', 'self_arg': 'self', diff --git a/test/engine/test_processors.py b/test/engine/test_processors.py index b1c482f09..e67666035 100644 --- a/test/engine/test_processors.py +++ b/test/engine/test_processors.py @@ -61,7 +61,7 @@ class CDateProcessorTest(_DateProcessorTest): __requires__ = ('cextensions',) @classmethod def setup_class(cls): - from sqlalchemy import cprocessors + from sqlalchemy_speedups import cprocessors cls.module = cprocessors @@ -164,5 +164,5 @@ class CDistillArgsTest(_DistillArgsTest): __requires__ = ('cextensions', ) @classmethod def setup_class(cls): - from sqlalchemy import cutils as util + from sqlalchemy_speedups import cutils as util cls.module = util diff --git a/test/requirements.py b/test/requirements.py index 38b445542..cb76ad5e1 100644 --- a/test/requirements.py +++ b/test/requirements.py @@ -727,7 +727,7 @@ class DefaultRequirements(SuiteRequirements): def _has_cextensions(self): try: - from sqlalchemy import cresultproxy, cprocessors + import sqlalchemy_speedups return True except ImportError: return False |