- skip this test for py3k. serializer kind of a bust

Conflicts:
	test/ext/test_serializer.py

diff --git a/test/ext/test_serializer.py b/test/ext/test_serializer.py
index 74e033b4f5ccc80a39417b3b7c7d337eb36c16c5..402b64fe2bd6db50907f64991e508e2963459eaf 100644 (file)
--- a/test/ext/test_serializer.py
+++ b/test/ext/test_serializer.py
@@ -122,9 +122,9 @@ class SerializeTest(fixtures.MappedTest):
         q2 = serializer.loads(serializer.dumps(q, -1), users.metadata,
                               Session)
         eq_(q2.all(), [User(name='fred')])
-        eq_(list(q2.values(User.id, User.name)), [(9, u'fred')])
+        eq_(list(q2.values(User.id, User.name)), [(9, 'fred')])
 
-    @testing.skip_if(lambda: util.pypy, "problems with pypy pickle reported")
+    @testing.requires.bulletproof_pickle
     def test_query_three(self):
         ua = aliased(User)
         q = \

diff --git a/test/requirements.py b/test/requirements.py
index c20bcbd0a936cafbc5c834a688476c7c3abf977a..42128669d8d69dcb38cb718115217af77893f87e 100644 (file)
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -556,6 +556,14 @@ class DefaultRequirements(SuiteRequirements):
                "cPython interpreter needed"
              )
 
+    @property
+    def bulletproof_pickle(self):
+        from sqlalchemy.util import pickle
+        return only_if(
+            lambda: pickle.__name__ == 'cPickle' and sys.version_info < (3, 0),
+            "Needs Python 2.x cPickle"
+        )
+
     @property
     def predictable_gc(self):
         """target platform must remove all cycles unconditionally when