[Sqlalchemy-commits] [1357] sqlalchemy/trunk/test: added 'supports', 'unsupports' decorators to unit
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1357] sqlalchemy/trunk/test: added 'supports', 'unsupports' decorators to unittests so that they can all pass on all DBs
|
From: <co...@sq...> - 2006-04-29 16:42:47
|
<!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><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 { 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; } #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>[1357] sqlalchemy/trunk/test: added 'supports', 'unsupports' decorators to unittests so that they can all pass on all DBs</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1357</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-29 11:42:37 -0500 (Sat, 29 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>added 'supports', 'unsupports' decorators to unittests so that they can all pass on all DBs</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunktestdefaultspy">sqlalchemy/trunk/test/defaults.py</a></li> <li><a href="#sqlalchemytrunktestinheritancepy">sqlalchemy/trunk/test/inheritance.py</a></li> <li><a href="#sqlalchemytrunktestobjectstorepy">sqlalchemy/trunk/test/objectstore.py</a></li> <li><a href="#sqlalchemytrunktestselectresultspy">sqlalchemy/trunk/test/selectresults.py</a></li> <li><a href="#sqlalchemytrunktesttestbasepy">sqlalchemy/trunk/test/testbase.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunktestdefaultspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/defaults.py (1356 => 1357)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/defaults.py 2006-04-29 16:12:02 UTC (rev 1356) +++ sqlalchemy/trunk/test/defaults.py 2006-04-29 16:42:37 UTC (rev 1357) </span><span class="lines">@@ -131,7 +131,8 @@ </span><span class="cx"> ) </span><span class="cx"> </span><span class="cx"> cartitems.create() </span><del>- </del><ins>+ + @testbase.supported('postgres', 'oracle') </ins><span class="cx"> def testsequence(self): </span><span class="cx"> cartitems.insert().execute(description='hi') </span><span class="cx"> cartitems.insert().execute(description='there') </span><span class="lines">@@ -140,6 +141,7 @@ </span><span class="cx"> cartitems.select().execute().fetchall() </span><span class="cx"> </span><span class="cx"> </span><ins>+ @testbase.supported('postgres', 'oracle') </ins><span class="cx"> def teststandalone(self): </span><span class="cx"> s = Sequence("my_sequence", engine=db) </span><span class="cx"> s.create() </span><span class="lines">@@ -149,6 +151,7 @@ </span><span class="cx"> finally: </span><span class="cx"> s.drop() </span><span class="cx"> </span><ins>+ @testbase.supported('postgres', 'oracle') </ins><span class="cx"> def teststandalone2(self): </span><span class="cx"> x = cartitems.c.cart_id.sequence.execute() </span><span class="cx"> self.assert_(1 <= x <= 4) </span></span></pre></div> <a id="sqlalchemytrunktestinheritancepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/inheritance.py (1356 => 1357)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/inheritance.py 2006-04-29 16:12:02 UTC (rev 1356) +++ sqlalchemy/trunk/test/inheritance.py 2006-04-29 16:42:37 UTC (rev 1357) </span><span class="lines">@@ -384,7 +384,9 @@ </span><span class="cx"> # shouldnt throw exception </span><span class="cx"> products = mapper(Product, product, inherits=contents) </span><span class="cx"> </span><ins>+ </ins><span class="cx"> def testbackref(self): </span><ins>+ """this test is currently known to fail in the 0.1 series of SQLAlchemy, pending the resolution of [ticket:154]""" </ins><span class="cx"> class ContentType(object): pass </span><span class="cx"> class Content(object): pass </span><span class="cx"> class Product(Content): pass </span></span></pre></div> <a id="sqlalchemytrunktestobjectstorepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/objectstore.py (1356 => 1357)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/objectstore.py 2006-04-29 16:12:02 UTC (rev 1356) +++ sqlalchemy/trunk/test/objectstore.py 2006-04-29 16:42:37 UTC (rev 1357) </span><span class="lines">@@ -143,7 +143,8 @@ </span><span class="cx"> trans.commit() </span><span class="cx"> self.assert_(name_of(7) != name1, msg="user_name should not be %s" % name1) </span><span class="cx"> self.assert_(name_of(8) != name2, msg="user_name should not be %s" % name2) </span><del>- </del><ins>+ + @testbase.unsupported('sqlite') </ins><span class="cx"> def test_true_nested(self): </span><span class="cx"> """tests creating a new Session inside a database transaction, in </span><span class="cx"> conjunction with an engine-level nested transaction, which uses </span><span class="lines">@@ -185,7 +186,8 @@ </span><span class="cx"> version_table.delete().execute() </span><span class="cx"> objectstore.clear() </span><span class="cx"> clear_mappers() </span><del>- </del><ins>+ + @testbase.unsupported('mysql') </ins><span class="cx"> def testbasic(self): </span><span class="cx"> class Foo(object):pass </span><span class="cx"> assign_mapper(Foo, version_table, version_id_col=version_table.c.version_id) </span><span class="lines">@@ -287,6 +289,8 @@ </span><span class="cx"> def setUp(self): </span><span class="cx"> objectstore.clear() </span><span class="cx"> clear_mappers() </span><ins>+ + @testbase.unsupported('sqlite') </ins><span class="cx"> def testprimarykey(self): </span><span class="cx"> class Entry(object): </span><span class="cx"> pass </span></span></pre></div> <a id="sqlalchemytrunktestselectresultspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/selectresults.py (1356 => 1357)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/selectresults.py 2006-04-29 16:12:02 UTC (rev 1356) +++ sqlalchemy/trunk/test/selectresults.py 2006-04-29 16:42:37 UTC (rev 1357) </span><span class="lines">@@ -42,8 +42,14 @@ </span><span class="cx"> assert self.res.count() == 100 </span><span class="cx"> assert self.res.filter(foo.c.bar<30).min(foo.c.bar) == 0 </span><span class="cx"> assert self.res.filter(foo.c.bar<30).max(foo.c.bar) == 29 </span><ins>+ + @testbase.unsupported('mysql') + def test_aggregate_1(self): </ins><span class="cx"> # this one fails in mysql as the result comes back as a string </span><span class="cx"> assert self.res.filter(foo.c.bar<30).sum(foo.c.bar) == 435 </span><ins>+ + @testbase.unsupported('postgres', 'mysql') + def test_aggregate_2(self): </ins><span class="cx"> # this one fails with postgres, the floating point comparison fails </span><span class="cx"> assert self.res.filter(foo.c.bar<30).avg(foo.c.bar) == 14.5 </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemytrunktesttestbasepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/testbase.py (1356 => 1357)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/testbase.py 2006-04-29 16:12:02 UTC (rev 1356) +++ sqlalchemy/trunk/test/testbase.py 2006-04-29 16:42:37 UTC (rev 1357) </span><span class="lines">@@ -59,13 +59,44 @@ </span><span class="cx"> db = engine.create_engine(db_uri, echo=echo, default_ordering=True, **opts) </span><span class="cx"> db = EngineAssert(db) </span><span class="cx"> </span><ins>+def unsupported(*dbs): + """a decorator that marks a test as unsupported by one or more database implementations""" + def decorate(func): + name = db.name + for d in dbs: + if d == name: + def lala(self): + echo_text("'" + func.__name__ + "' unsupported on DB implementation '" + name + "'") + lala.__name__ = func.__name__ + return lala + else: + return func + return decorate + +def supported(*dbs): + """a decorator that marks a test as supported by one or more database implementations""" + def decorate(func): + name = db.name + for d in dbs: + if d == name: + return func + else: + def lala(self): + echo_text("'" + func.__name__ + "' unsupported on DB implementation '" + name + "'") + lala.__name__ = func.__name__ + return lala + return decorate + +def echo_text(text): + print text + </ins><span class="cx"> class PersistTest(unittest.TestCase): </span><span class="cx"> """persist base class, provides default setUpAll, tearDownAll and echo functionality""" </span><span class="cx"> def __init__(self, *args, **params): </span><span class="cx"> unittest.TestCase.__init__(self, *args, **params) </span><span class="cx"> def echo(self, text): </span><span class="cx"> if echo: </span><del>- print text </del><ins>+ echo_text(text) </ins><span class="cx"> def setUpAll(self): </span><span class="cx"> pass </span><span class="cx"> def tearDownAll(self): </span></span></pre> </div> </div> </body> </html> |
