diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-08-20 09:08:59 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-08-20 09:08:59 -0400 |
commit | cea97d1fae999001eb991ae1da9db226f2d3b5da (patch) | |
tree | 887ff839bb6cb05b01ec0398c3db47e1d2e457a2 | |
parent | 28103e9a865860a46037ca82e634827f2329deb0 (diff) | |
download | sqlalchemy-cea97d1fae999001eb991ae1da9db226f2d3b5da.tar.gz |
- pep8 cleanup
-rw-r--r-- | test/engine/test_execute.py | 1 | ||||
-rw-r--r-- | test/engine/test_logging.py | 37 |
2 files changed, 13 insertions, 25 deletions
diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py index f65168552..d8e1c655e 100644 --- a/test/engine/test_execute.py +++ b/test/engine/test_execute.py @@ -21,7 +21,6 @@ from sqlalchemy.testing import fixtures from sqlalchemy.testing.mock import Mock, call, patch from contextlib import contextmanager from sqlalchemy.util import nested -import logging.handlers # needed for logging tests to work correctly users, metadata, users_autoinc = None, None, None diff --git a/test/engine/test_logging.py b/test/engine/test_logging.py index ea2ad3964..5d792e470 100644 --- a/test/engine/test_logging.py +++ b/test/engine/test_logging.py @@ -1,30 +1,17 @@ -from sqlalchemy.testing import eq_, assert_raises, assert_raises_message, \ - config, is_ -import re -from sqlalchemy.testing.util import picklers -from sqlalchemy.interfaces import ConnectionProxy -from sqlalchemy import MetaData, Integer, String, INT, VARCHAR, func, \ - bindparam, select, event, TypeDecorator, create_engine, Sequence -from sqlalchemy.sql import column, literal -from sqlalchemy.testing.schema import Table, Column +from sqlalchemy.testing import eq_, assert_raises_message +from sqlalchemy import select import sqlalchemy as tsa -from sqlalchemy import testing from sqlalchemy.testing import engines -from sqlalchemy import util -from sqlalchemy.testing.engines import testing_engine import logging.handlers -from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam -from sqlalchemy.engine import result as _result, default -from sqlalchemy.engine.base import Engine from sqlalchemy.testing import fixtures -from sqlalchemy.testing.mock import Mock, call, patch + class LogParamsTest(fixtures.TestBase): __only_on__ = 'sqlite' __requires__ = 'ad_hoc_engines', def setup(self): - self.eng = engines.testing_engine(options={'echo':True}) + self.eng = engines.testing_engine(options={'echo': True}) self.eng.execute("create table foo (data string)") self.buf = logging.handlers.BufferingHandler(100) for log in [ @@ -44,7 +31,7 @@ class LogParamsTest(fixtures.TestBase): def test_log_large_dict(self): self.eng.execute( "INSERT INTO foo (data) values (:data)", - [{"data":str(i)} for i in range(100)] + [{"data": str(i)} for i in range(100)] ) eq_( self.buf.buffer[1].message, @@ -76,7 +63,7 @@ class LogParamsTest(fixtures.TestBase): "100 total bound parameter sets ... {'data': '98'}, {'data': '99'}\]", lambda: self.eng.execute( "INSERT INTO nonexistent (data) values (:data)", - [{"data":str(i)} for i in range(100)] + [{"data": str(i)} for i in range(100)] ) ) @@ -94,6 +81,7 @@ class LogParamsTest(fixtures.TestBase): ) ) + class LoggingNameTest(fixtures.TestBase): __requires__ = 'ad_hoc_engines', @@ -104,7 +92,7 @@ class LoggingNameTest(fixtures.TestBase): assert name in ( 'sqlalchemy.engine.base.Engine.%s' % eng_name, 'sqlalchemy.pool.%s.%s' % - (eng.pool.__class__.__name__, pool_name) + (eng.pool.__class__.__name__, pool_name) ) def _assert_no_name_in_execute(self, eng): @@ -118,15 +106,15 @@ class LoggingNameTest(fixtures.TestBase): def _named_engine(self, **kw): options = { - 'logging_name':'myenginename', - 'pool_logging_name':'mypoolname', - 'echo':True + 'logging_name': 'myenginename', + 'pool_logging_name': 'mypoolname', + 'echo': True } options.update(kw) return engines.testing_engine(options=options) def _unnamed_engine(self, **kw): - kw.update({'echo':True}) + kw.update({'echo': True}) return engines.testing_engine(options=kw) def setup(self): @@ -183,6 +171,7 @@ class LoggingNameTest(fixtures.TestBase): eng = self._unnamed_engine(echo='debug', echo_pool='debug') self._assert_no_name_in_execute(eng) + class EchoTest(fixtures.TestBase): __requires__ = 'ad_hoc_engines', |