[patch] patch based on upstream with 1 exception.

sqlalchemy-0.8.2-skip-pypy-tests.patch (text/plain), 3.87 KB, created by Ian Delaney (RETIRED) on 2013-08-19 16:00:57 UTC

https://github.com/zzzeek/sqlalchemy/pull/22
diff -ur SQLAlchemy-0.8.2.orig/test/ext/test_serializer.py SQLAlchemy-0.8.2/test/ext/test_serializer.py
--- test/ext/test_serializer.py	2013-07-04 03:44:19.000000000 +0800
+++ test/ext/test_serializer.py	2013-08-19 01:57:12.866652313 +0800
@@ -125,6 +126,7 @@
         eq_(list(q2.values(User.id, User.name)), [(9, 'fred')])
 
     @testing.requires.bulletproof_pickle
+    @testing.skip_if(lambda: util.pypy, "pypy unsupported, fixed in 0.9")
     def test_query_three(self):
         ua = aliased(User)
         q = \
diff -ur SQLAlchemy-0.8.2.orig/test/orm/test_unitofwork.py SQLAlchemy-0.8.2/test/orm/test_unitofwork.py
--- test/orm/test_unitofwork.py	2013-07-04 03:44:19.000000000 +0800
+++ test/orm/test_unitofwork.py	2013-08-19 01:53:48.881660808 +0800
@@ -16,6 +16,7 @@
 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,7 @@
 
     @testing.fails_on('mssql+pyodbc',
                       'pyodbc returns a non unicode encoding of the results description.')
+    @testing.skip_if(lambda: util.pypy, "pypy unsupported, fixed in 0.9")
     def test_mapping(self):
         t2, t1 = self.tables.t2, self.tables.t1
 
@@ -197,6 +199,7 @@
 
     @testing.fails_on('mssql+pyodbc',
                       'pyodbc returns a non unicode encoding of the results description.')
+    @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
 
@@ -2518,4 +2521,4 @@
         s.commit()
 
         t.col1 = "1"
-        s.commit()
\ No newline at end of file
+        s.commit()
# These don't work with skip_if for unknown reason
diff -ur SQLAlchemy-0.8.2.orig/test/sql/test_unicode.py SQLAlchemy-0.8.2/test/sql/test_unicode.py
--- test/sql/test_unicode.py	2013-07-04 03:44:19.000000000 +0800
+++ test/sql/test_unicode.py	2013-08-19 01:55:47.498655868 +0800
@@ -3,6 +3,7 @@
 from sqlalchemy import *
 from sqlalchemy.testing import fixtures, engines
 from sqlalchemy import testing
+import unittest, sys
 from sqlalchemy.testing.engines import utf8_engine
 from sqlalchemy.sql import column
 from sqlalchemy.testing.schema import Table, Column
@@ -71,6 +72,7 @@
         metadata.drop_all()
         del unicode_bind
 
+    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy unsupported, fixed 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 +85,7 @@
         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")
     def test_reflect(self):
         t1.insert().execute({u'méil':2, u'\u6e2c\u8a66':7})
         t2.insert().execute({'a':2, 'b':2})
diff -ur SQLAlchemy-0.8.2.orig/lib/sqlalchemy/testing/suite/test_insert.py SQLAlchemy-0.8.2/lib/sqlalchemy/testing/suite/test_insert.py
--- lib/sqlalchemy/testing/suite/test_insert.py	2013-07-04 03:44:19.000000000 +0800
+++ lib/sqlalchemy/testing/suite/test_insert.py	2013-08-19 02:27:05.428577660 +0800
@@ -4,7 +4,7 @@
 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
 
@@ -59,6 +59,7 @@
     @exclusions.fails_if(lambda: lambda: util.pypy, "lastrowid not maintained after "
                             "connection close")
     @requirements.dbapi_lastrowid
+    @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(),