summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-06-14 18:34:01 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-06-14 18:34:01 -0400
commit9d3e2206363d819ad334d7893c700b861fdc5b57 (patch)
tree38acbc1c7238551795a556e20afb12567482da06
parent02ec9afb15c2a215e0d8b777669a6edc2ed00451 (diff)
downloadsqlalchemy-9d3e2206363d819ad334d7893c700b861fdc5b57.tar.gz
- skip this test for py3k. serializer kind of a bust
-rw-r--r--test/ext/test_serializer.py2
-rw-r--r--test/requirements.py8
2 files changed, 9 insertions, 1 deletions
diff --git a/test/ext/test_serializer.py b/test/ext/test_serializer.py
index 84fff1304..f673d5699 100644
--- a/test/ext/test_serializer.py
+++ b/test/ext/test_serializer.py
@@ -124,7 +124,7 @@ class SerializeTest(fixtures.MappedTest):
eq_(q2.all(), [User(name='fred')])
eq_(list(q2.values(User.id, User.name)), [(9, 'fred')])
- @testing.requires.non_broken_pickle
+ @testing.requires.bulletproof_pickle
def test_query_three(self):
ua = aliased(User)
q = \
diff --git a/test/requirements.py b/test/requirements.py
index 973ad9a10..aa36dcf85 100644
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -581,6 +581,14 @@ class DefaultRequirements(SuiteRequirements):
)
@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
gc.collect() is called, as well as clean out unreferenced subclasses.