From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 21 Aug 2013 03:32:23 +0000 (-0400)
Subject: apply test skips for pypy issue #1573 in 0.8 [ticket:2805]
X-Git-Tag: rel_0_8_3~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06fd903af824fbc992635f05e9d958df7fa63564;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

apply test skips for pypy issue #1573 in 0.8 [ticket:2805]
---

diff --git a/test/orm/test_unitofwork.py b/test/orm/test_unitofwork.py
index 6be1672e16..7537800575 100644
--- a/test/orm/test_unitofwork.py
+++ b/test/orm/test_unitofwork.py
@@ -16,6 +16,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
+from sqlalchemy import testing, util
 
 class UnitOfWorkTest(object):
     pass
@@ -158,6 +159,9 @@ class UnicodeSchemaTest(fixtures.MappedTest):
 
     @testing.fails_on('mssql+pyodbc',
                       'pyodbc returns a non unicode encoding of the results description.')
+    @testing.skip_if(lambda: util.pypy,
+            "pypy/sqlite3 reports unicode cursor.description "
+            "incorrectly pre 2.2, workaround applied in 0.9")
     def test_mapping(self):
         t2, t1 = self.tables.t2, self.tables.t1
 
@@ -197,6 +201,9 @@ class UnicodeSchemaTest(fixtures.MappedTest):
 
     @testing.fails_on('mssql+pyodbc',
                       'pyodbc returns a non unicode encoding of the results description.')
+    @testing.skip_if(lambda: util.pypy,
+            "pypy/sqlite3 reports unicode cursor.description "
+            "incorrectly pre 2.2, workaround applied in 0.9")
     def test_inheritance_mapping(self):
         t2, t1 = self.tables.t2, self.tables.t1
 
@@ -2518,4 +2525,4 @@ class PartialNullPKTest(fixtures.MappedTest):
         s.commit()
 
         t.col1 = "1"
-        s.commit()
\ No newline at end of file
+        s.commit()
diff --git a/test/sql/test_unicode.py b/test/sql/test_unicode.py
index 37e44522e0..a7b5cdf3c8 100644
--- a/test/sql/test_unicode.py
+++ b/test/sql/test_unicode.py
@@ -3,7 +3,7 @@
 
 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
@@ -71,6 +71,9 @@ class UnicodeSchemaTest(fixtures.TestBase):
         metadata.drop_all()
         del unicode_bind
 
+    @testing.skip_if(lambda: util.pypy,
+            "pypy/sqlite3 reports unicode cursor.description "
+            "incorrectly pre 2.2, workaround applied in 0.9")
     def test_insert(self):
         t1.insert().execute({u'méil':1, u'\u6e2c\u8a66':5})
         t2.insert().execute({'a':1, 'b':1})
@@ -83,6 +86,9 @@ class UnicodeSchemaTest(fixtures.TestBase):
         assert t2.select().execute().fetchall() == [(1, 1)]
         assert t3.select().execute().fetchall() == [(1, 5, 1, 1)]
 
+    @testing.skip_if(lambda: util.pypy,
+            "pypy/sqlite3 reports unicode cursor.description "
+            "incorrectly pre 2.2, workaround applied in 0.9")
     def test_reflect(self):
         t1.insert().execute({u'méil':2, u'\u6e2c\u8a66':7})
         t2.insert().execute({'a':2, 'b':2})