[Sqlalchemy-commits] [6152] sqlalchemy/branches/rel_0_6/test: skip sqlite tests when it' s not avai
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [6152] sqlalchemy/branches/rel_0_6/test: skip sqlite tests when it' s not available
|
From: <co...@sq...> - 2009-07-19 06:36:31
|
<!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>[6152] sqlalchemy/branches/rel_0_6/test: skip sqlite tests when it' s not available</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>6152</dd> <dt>Author</dt> <dd>pjenvey</dd> <dt>Date</dt> <dd>2009-07-19 02:36:20 -0400 (Sun, 19 Jul 2009)</dd> </dl> <h3>Log Message</h3> <pre>skip sqlite tests when it's not available</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesrel_0_6testenginetest_ddleventspy">sqlalchemy/branches/rel_0_6/test/engine/test_ddlevents.py</a></li> <li><a href="#sqlalchemybranchesrel_0_6testormshardingtest_shardpy">sqlalchemy/branches/rel_0_6/test/orm/sharding/test_shard.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesrel_0_6testenginetest_ddleventspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_6/test/engine/test_ddlevents.py (6151 => 6152)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_6/test/engine/test_ddlevents.py 2009-07-19 06:29:43 UTC (rev 6151) +++ sqlalchemy/branches/rel_0_6/test/engine/test_ddlevents.py 2009-07-19 06:36:20 UTC (rev 6152) </span><span class="lines">@@ -7,6 +7,7 @@ </span><span class="cx"> import sqlalchemy as tsa </span><span class="cx"> from sqlalchemy.test import TestBase, testing, engines </span><span class="cx"> from sqlalchemy.test.testing import AssertsCompiledSQL </span><ins>+from nose import SkipTest </ins><span class="cx"> </span><span class="cx"> class DDLEventTest(TestBase): </span><span class="cx"> class Canary(object): </span><span class="lines">@@ -281,7 +282,10 @@ </span><span class="cx"> assert 'fnord' in strings </span><span class="cx"> </span><span class="cx"> def test_ddl_execute(self): </span><del>- engine = create_engine('sqlite:///') </del><ins>+ try: + engine = create_engine('sqlite:///') + except ImportError: + raise SkipTest('Requires sqlite') </ins><span class="cx"> cx = engine.connect() </span><span class="cx"> table = self.users </span><span class="cx"> ddl = DDL('SELECT 1') </span></span></pre></div> <a id="sqlalchemybranchesrel_0_6testormshardingtest_shardpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_6/test/orm/sharding/test_shard.py (6151 => 6152)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_6/test/orm/sharding/test_shard.py 2009-07-19 06:29:43 UTC (rev 6151) +++ sqlalchemy/branches/rel_0_6/test/orm/sharding/test_shard.py 2009-07-19 06:36:20 UTC (rev 6152) </span><span class="lines">@@ -6,6 +6,7 @@ </span><span class="cx"> from sqlalchemy.sql import operators </span><span class="cx"> from sqlalchemy.test import * </span><span class="cx"> from sqlalchemy.test.testing import eq_ </span><ins>+from nose import SkipTest </ins><span class="cx"> </span><span class="cx"> # TODO: ShardTest can be turned into a base for further subclasses </span><span class="cx"> </span><span class="lines">@@ -14,7 +15,10 @@ </span><span class="cx"> def setup_class(cls): </span><span class="cx"> global db1, db2, db3, db4, weather_locations, weather_reports </span><span class="cx"> </span><del>- db1 = create_engine('sqlite:///shard1.db') </del><ins>+ try: + db1 = create_engine('sqlite:///shard1.db') + except ImportError: + raise SkipTest('Requires sqlite') </ins><span class="cx"> db2 = create_engine('sqlite:///shard2.db') </span><span class="cx"> db3 = create_engine('sqlite:///shard3.db') </span><span class="cx"> db4 = create_engine('sqlite:///shard4.db') </span></span></pre> </div> </div> </body> </html> |