Adjusted fix for skipping tests unsupported by pypy in 0.8.xpr/22

4 files changed, 10 insertions, 12 deletions

diff --git a/lib/sqlalchemy/testing/suite/test_insert.py b/lib/sqlalchemy/testing/suite/test_insert.py
index 6b9f80080..81a30ee9a 100644
--- a/lib/sqlalchemy/testing/suite/test_insert.py
+++ b/lib/sqlalchemy/testing/suite/test_insert.py
@@ -4,10 +4,10 @@ from .. import exclusions
 from ..assertions import eq_
 from .. import engines
 
-from sqlalchemy import Integer, String, select, util
+from sqlalchemy import Integer, String, select, testing, util
 
 from ..schema import Table, Column
-import unittest, sys          
+         
 
 class LastrowidTest(fixtures.TablesTest):
     run_deletes = 'each'
@@ -60,7 +60,7 @@ class LastrowidTest(fixtures.TablesTest):
     #@exclusions.fails_if(lambda: util.pypy, "lastrowid not maintained after "
     #                        "connection close")
     @requirements.dbapi_lastrowid
-    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy unsupported, fixed in 0.9")
+    @testing.skip_if(lambda: util.pypy, "pypy unsupported, fixed in 0.9")
     def test_native_lastrowid_autoinc(self):
         r = config.db.execute(
             self.tables.autoinc_pk.insert(),
diff --git a/test/ext/test_serializer.py b/test/ext/test_serializer.py
index dc1f0e252..c6c28ec69 100644
--- a/test/ext/test_serializer.py
+++ b/test/ext/test_serializer.py
@@ -8,7 +8,6 @@ from sqlalchemy.testing.schema import Column
 from sqlalchemy.orm import relationship, sessionmaker, scoped_session, \
     class_mapper, mapper, joinedload, configure_mappers, aliased
 from sqlalchemy.testing import eq_
-import unittest, sys
 
 from sqlalchemy.testing import fixtures
 
@@ -126,7 +125,7 @@ class SerializeTest(fixtures.MappedTest):
         eq_(list(q2.values(User.id, User.name)), [(9, 'fred')])
 
     @testing.requires.non_broken_pickle
-    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy unsupported, fixed in 0.9")
+    @testing.skip_if(lambda: util.pypy, "pypy unsupported, fixed in 0.9")
     def test_query_three(self):
         ua = aliased(User)
         q = \
diff --git a/test/orm/test_unitofwork.py b/test/orm/test_unitofwork.py
index ced65aadf..0440a090a 100644
--- a/test/orm/test_unitofwork.py
+++ b/test/orm/test_unitofwork.py
@@ -17,7 +17,7 @@ from sqlalchemy.orm import mapper, relationship, create_session, \
 from sqlalchemy.testing import fixtures
 from test.orm import _fixtures
 from sqlalchemy.testing.assertsql import AllOf, CompiledSQL
-import unittest, sys
+from sqlalchemy import testing, util
 
 class UnitOfWorkTest(object):
     pass
@@ -160,7 +160,7 @@ class UnicodeSchemaTest(fixtures.MappedTest):
 
     @testing.fails_on('mssql+pyodbc',
                       'pyodbc returns a non unicode encoding of the results description.')
-    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy unsupported, fixed in 0.9")
+    @testing.skip_if(lambda: util.pypy, "pypy unsupported, fixed in 0.9")
     def test_mapping(self):
         t2, t1 = self.tables.t2, self.tables.t1
 
@@ -200,7 +200,7 @@ class UnicodeSchemaTest(fixtures.MappedTest):
 
     @testing.fails_on('mssql+pyodbc',
                       'pyodbc returns a non unicode encoding of the results description.')
-    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy unsupported, fixed in 0.9")
+    @testing.skip_if(lambda: util.pypy, "pypy unsupported, fixed in 0.9")
     def test_inheritance_mapping(self):
         t2, t1 = self.tables.t2, self.tables.t1
 
diff --git a/test/sql/test_unicode.py b/test/sql/test_unicode.py
index e08bb586b..65ddc102a 100644
--- a/test/sql/test_unicode.py
+++ b/test/sql/test_unicode.py
@@ -3,12 +3,11 @@
 
 from sqlalchemy import *
 from sqlalchemy.testing import fixtures, engines
-from sqlalchemy import testing
+from sqlalchemy import testing, util
 from sqlalchemy.testing.engines import utf8_engine
 from sqlalchemy.sql import column
 from sqlalchemy.testing.schema import Table, Column
 from sqlalchemy.util import u, ue
-import unittest, sys
 
 class UnicodeSchemaTest(fixtures.TestBase):
     __requires__ = ('unicode_ddl',)
@@ -73,7 +72,7 @@ class UnicodeSchemaTest(fixtures.TestBase):
         metadata.drop_all()
         del unicode_bind
 
-    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy unsupported, fixed in 0.9")
+    @testing.skip_if(lambda: util.pypy, "pypy unsupported, fixed in 0.9")
     def test_insert(self):
         t1.insert().execute({u('méil'):1, ue('\u6e2c\u8a66'):5})
         t2.insert().execute({u('a'):1, u('b'):1})
@@ -86,7 +85,7 @@ class UnicodeSchemaTest(fixtures.TestBase):
         assert t2.select().execute().fetchall() == [(1, 1)]
         assert t3.select().execute().fetchall() == [(1, 5, 1, 1)]
 
-    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy unsupported, fixed in 0.9")
+    @testing.skip_if(lambda: util.pypy, "pypy unsupported, fixed in 0.9")
     def test_reflect(self):
         t1.insert().execute({u('méil'):2, ue('\u6e2c\u8a66'):7})
         t2.insert().execute({u('a'):2, u('b'):2})