From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 25 Dec 2009 16:50:49 +0000 (+0000)
Subject: - merge sqlite 2.5 memory exception from r6567 of 0.5 branch
X-Git-Tag: rel_0_6beta1~118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa6f068a92cd7f62479b8555bf114053a5be31d6;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- merge sqlite 2.5 memory exception from r6567 of 0.5 branch
---

diff --git a/test/aaa_profiling/test_memusage.py b/test/aaa_profiling/test_memusage.py
index fbf0560ca1..057adb06aa 100644
--- a/test/aaa_profiling/test_memusage.py
+++ b/test/aaa_profiling/test_memusage.py
@@ -309,6 +309,12 @@ class MemUsageTest(EnsureZeroed):
             metadata.drop_all()
         assert_no_mappers()
 
+    # fails on newer versions of pysqlite due to unusual memory 
+    # behvior in pysqlite itself.
+    # background at: http://thread.gmane.org/gmane.comp.python.db.pysqlite.user/2290
+    @testing.fails_if(lambda: 
+                        testing.db.dialect.name == 'sqlite' and 
+                        testing.db.dialect.dbapi.version > '2.5')
     def test_join_cache(self):
         metadata = MetaData(testing.db)