[Sqlalchemy-commits] [5018] sqlalchemy/branches/rel_0_4/test: added a "live" test of recycle to fur
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [5018] sqlalchemy/branches/rel_0_4/test: added a "live" test of recycle to further ensure #1133 is not valid
|
From: <co...@sq...> - 2008-08-10 05:15:19
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[5018] sqlalchemy/branches/rel_0_4/test: added a "live" test of recycle to further ensure #1133 is not valid</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>5018</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2008-08-10 01:15:11 -0400 (Sun, 10 Aug 2008)</dd> </dl> <h3>Log Message</h3> <pre>added a "live" test of recycle to further ensure #1133 is not valid</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesrel_0_4testenginereconnectpy">sqlalchemy/branches/rel_0_4/test/engine/reconnect.py</a></li> <li><a href="#sqlalchemybranchesrel_0_4testtestlibenginespy">sqlalchemy/branches/rel_0_4/test/testlib/engines.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesrel_0_4testenginereconnectpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_4/test/engine/reconnect.py (5017 => 5018)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_4/test/engine/reconnect.py 2008-08-08 15:50:36 UTC (rev 5017) +++ sqlalchemy/branches/rel_0_4/test/engine/reconnect.py 2008-08-10 05:15:11 UTC (rev 5018) </span><span class="lines">@@ -2,8 +2,8 @@ </span><span class="cx"> import sys, weakref </span><span class="cx"> from sqlalchemy import create_engine, exceptions, select, MetaData, Table, Column, Integer, String </span><span class="cx"> from testlib import * </span><ins>+import time </ins><span class="cx"> </span><del>- </del><span class="cx"> class MockDisconnect(Exception): </span><span class="cx"> pass </span><span class="cx"> </span><span class="lines">@@ -275,6 +275,22 @@ </span><span class="cx"> self.assertEquals(conn.execute(select([1])).scalar(), 1) </span><span class="cx"> assert not conn.invalidated </span><span class="cx"> </span><ins>+class RecycleTest(TestBase): + def test_basic(self): + for threadlocal in (False, True): + engine = engines.reconnecting_engine(options={'pool_recycle':1, 'pool_threadlocal':threadlocal}) + + conn = engine.connect() + self.assertEquals(conn.execute(select([1])).scalar(), 1) + conn.close() + + engine.test_shutdown() + time.sleep(2) + + conn = engine.connect() + self.assertEquals(conn.execute(select([1])).scalar(), 1) + conn.close() + </ins><span class="cx"> class InvalidateDuringResultTest(TestBase): </span><span class="cx"> def setUp(self): </span><span class="cx"> global meta, table, engine </span></span></pre></div> <a id="sqlalchemybranchesrel_0_4testtestlibenginespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_4/test/testlib/engines.py (5017 => 5018)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_4/test/testlib/engines.py 2008-08-08 15:50:36 UTC (rev 5017) +++ sqlalchemy/branches/rel_0_4/test/testlib/engines.py 2008-08-10 05:15:11 UTC (rev 5018) </span><span class="lines">@@ -87,7 +87,10 @@ </span><span class="cx"> def reconnecting_engine(url=None, options=None): </span><span class="cx"> url = url or config.db_url </span><span class="cx"> dbapi = config.db.dialect.dbapi </span><del>- engine = testing_engine(url, {'module':ReconnectFixture(dbapi)}) </del><ins>+ if not options: + options = {} + options['module'] = ReconnectFixture(dbapi) + engine = testing_engine(url, options) </ins><span class="cx"> engine.test_shutdown = engine.dialect.dbapi.shutdown </span><span class="cx"> return engine </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |