diff options
| -rw-r--r-- | test/aaa_profiling/test_zoomark.py | 8 | ||||
| -rw-r--r-- | test/engine/test_parseconnect.py | 10 | ||||
| -rw-r--r-- | test/sql/test_types.py | 4 |
3 files changed, 13 insertions, 9 deletions
diff --git a/test/aaa_profiling/test_zoomark.py b/test/aaa_profiling/test_zoomark.py index 2b110a40f..66bb45f31 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 90c0969be..daa2dd5dc 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 62c579d71..c226b96ec 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'), )) |