From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 26 Oct 2009 01:29:56 +0000 (+0000)
Subject: test fixes
X-Git-Tag: rel_0_6beta1~218
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc714d614df349ba4ef35a2863ffe6e191881b26;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

test fixes
---

diff --git a/test/aaa_profiling/test_zoomark.py b/test/aaa_profiling/test_zoomark.py
index 2b110a40f4..66bb45f312 100644
--- a/test/aaa_profiling/test_zoomark.py
+++ b/test/aaa_profiling/test_zoomark.py
@@ -323,7 +323,7 @@ class ZooMarkTest(TestBase):
         engine.dialect._unwrap_connection = engines.unwrap_connection
         metadata = MetaData(engine)
 
-    @profiling.function_call_count(3178, {'2.4': 1796})
+    @profiling.function_call_count(3178, {'2.4': 1913})
     def test_profile_1_create_tables(self):
         self.test_baseline_1_create_tables()
 
@@ -339,11 +339,11 @@ class ZooMarkTest(TestBase):
     def test_profile_3_properties(self):
         self.test_baseline_3_properties()
 
-    @profiling.function_call_count(13341, {'2.4': 8434})
+    @profiling.function_call_count(13341, {'2.4': 7963})
     def test_profile_4_expressions(self):
         self.test_baseline_4_expressions()
 
-    @profiling.function_call_count(1241, {'2.4': 901})
+    @profiling.function_call_count(1241, {'2.4': 854})
     def test_profile_5_aggregates(self):
         self.test_baseline_5_aggregates()
 
@@ -351,7 +351,7 @@ class ZooMarkTest(TestBase):
     def test_profile_6_editing(self):
         self.test_baseline_6_editing()
 
-    @profiling.function_call_count(2641, {'2.4': 1844})
+    @profiling.function_call_count(2641, {'2.4': 1673})
     def test_profile_7_multiview(self):
         self.test_baseline_7_multiview()
 
diff --git a/test/engine/test_parseconnect.py b/test/engine/test_parseconnect.py
index 90c0969bed..daa2dd5dc1 100644
--- a/test/engine/test_parseconnect.py
+++ b/test/engine/test_parseconnect.py
@@ -112,7 +112,7 @@ pool_timeout=10
             'sqlalchemy.echo':'true'
         }
 
-        e = engine_from_config(config, module=dbapi)
+        e = engine_from_config(config, module=dbapi, _initialize=False)
         assert e.pool._recycle == 50
         assert e.url == url.make_url('postgresql://scott:tiger@somehost/test?fooz=somevalue')
         assert e.echo is True
@@ -176,11 +176,15 @@ pool_timeout=10
         assert e.pool._recycle == 50
 
         # these args work for QueuePool
-        e = create_engine('postgresql://', max_overflow=8, pool_timeout=60, poolclass=tsa.pool.QueuePool, module=mock_dbapi)
+        e = create_engine('postgresql://', 
+                            max_overflow=8, pool_timeout=60, 
+                            poolclass=tsa.pool.QueuePool, module=mock_dbapi, 
+                            _initialize=False)
 
         # but not SingletonThreadPool
         assert_raises(TypeError, create_engine, 'sqlite://', max_overflow=8, pool_timeout=60,
-                      poolclass=tsa.pool.SingletonThreadPool, module=mock_sqlite_dbapi)
+                      poolclass=tsa.pool.SingletonThreadPool, module=mock_sqlite_dbapi,
+                      _initialize=False)
 
 class MockDBAPI(object):
     def __init__(self, **kwargs):
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 62c579d715..c226b96ec6 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -262,8 +262,8 @@ class UnicodeTest(TestBase, AssertsExecutionResults):
             (
                 ('postgresql','psycopg2'),
                 ('postgresql','pg8000'),
-                ('postgresql','zxjdbc'),
-                ('mysql','zxjdbc'),
+                #('postgresql','zxjdbc'), # really ? why not pg
+                ('mysql','zxjdbc'),  # but then yes for Mysql ?
                 ('sqlite','pysqlite'),
             ))