From: Alex Gaynor Date: Wed, 16 Mar 2011 18:18:27 +0000 (-0400) Subject: this test fails on PyPy because it checks for a lastrowid after the connection is... X-Git-Tag: rel_0_7b3~8^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cf1a29b72973f99603b3df3832811844a6ef9b6;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git this test fails on PyPy because it checks for a lastrowid after the connection is lcosed --- diff --git a/test/ext/test_horizontal_shard.py b/test/ext/test_horizontal_shard.py index 45903a0e6a..ff99f22dc2 100644 --- a/test/ext/test_horizontal_shard.py +++ b/test/ext/test_horizontal_shard.py @@ -203,8 +203,8 @@ class ShardTest(TestBase): sess.query(WeatherLocation).all() eq_( - canary, - ['asia', 'north_america', 'north_america', - 'europe', 'europe', 'south_america', + canary, + ['asia', 'north_america', 'north_america', + 'europe', 'europe', 'south_america', 'south_america'] ) \ No newline at end of file diff --git a/test/lib/requires.py b/test/lib/requires.py index e3f044868b..1be308fe7e 100644 --- a/test/lib/requires.py +++ b/test/lib/requires.py @@ -13,7 +13,9 @@ from testing import \ skip_if,\ only_on,\ fails_on,\ - fails_on_everything_except + fails_on_everything_except,\ + fails_if +from sqlalchemy import util import testing import sys @@ -213,7 +215,7 @@ def offset(fn): def window_functions(fn): return _chain_decorators_on( fn, - only_on(('postgresql', 'mssql', 'oracle'), + only_on(('postgresql', 'mssql', 'oracle'), "Backend does not support window functions"), ) @@ -288,7 +290,8 @@ def dbapi_lastrowid(fn): return _chain_decorators_on( fn, fails_on_everything_except('mysql+mysqldb', 'mysql+oursql', - 'sqlite+pysqlite', 'mysql+pymysql') + 'sqlite+pysqlite', 'mysql+pymysql'), + fails_if(lambda: util.pypy), ) def sane_multi_rowcount(fn): @@ -303,7 +306,7 @@ def nullsordering(fn): fn, fails_on_everything_except('postgresql', 'oracle', 'firebird') ) - + def reflects_pk_names(fn): """Target driver reflects the name of primary key constraints.""" return _chain_decorators_on(