[Sqlalchemy-commits] [1503] sqlalchemy/branches/schema/test: echo print statement stuff
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1503] sqlalchemy/branches/schema/test: echo print statement stuff
|
From: <co...@sq...> - 2006-05-25 00:37:35
|
<!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>[1503] sqlalchemy/branches/schema/test: echo print statement stuff</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1503</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-24 19:37:16 -0500 (Wed, 24 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>echo print statement stuff</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschematestalltestspy">sqlalchemy/branches/schema/test/alltests.py</a></li> <li><a href="#sqlalchemybranchesschematestdefaultspy">sqlalchemy/branches/schema/test/defaults.py</a></li> <li><a href="#sqlalchemybranchesschematestindexespy">sqlalchemy/branches/schema/test/indexes.py</a></li> <li><a href="#sqlalchemybranchesschematesttestbasepy">sqlalchemy/branches/schema/test/testbase.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschematestalltestspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/alltests.py (1502 => 1503)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/alltests.py 2006-05-24 22:46:59 UTC (rev 1502) +++ sqlalchemy/branches/schema/test/alltests.py 2006-05-25 00:37:16 UTC (rev 1503) </span><span class="lines">@@ -1,17 +1,13 @@ </span><span class="cx"> import testbase </span><span class="cx"> import unittest </span><span class="cx"> </span><del>-testbase.echo = False - -#test - </del><span class="cx"> def suite(): </span><span class="cx"> modules_to_test = ( </span><span class="cx"> # core utilities </span><del>- 'historyarray', </del><ins>+ 'historyarray', </ins><span class="cx"> 'attributes', </span><span class="cx"> 'dependency', </span><del>- </del><ins>+ </ins><span class="cx"> # connectivity, execution </span><span class="cx"> 'pool', </span><span class="cx"> 'transaction', </span><span class="lines">@@ -66,8 +62,6 @@ </span><span class="cx"> alltests.addTest(unittest.findTestCases(module, suiteClass=None)) </span><span class="cx"> return alltests </span><span class="cx"> </span><del>-import sys -sys.stdout = sys.stderr </del><span class="cx"> </span><span class="cx"> if __name__ == '__main__': </span><span class="cx"> testbase.runTests(suite()) </span></span></pre></div> <a id="sqlalchemybranchesschematestdefaultspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/defaults.py (1502 => 1503)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/defaults.py 2006-05-24 22:46:59 UTC (rev 1502) +++ sqlalchemy/branches/schema/test/defaults.py 2006-05-25 00:37:16 UTC (rev 1503) </span><span class="lines">@@ -7,7 +7,7 @@ </span><span class="cx"> import sqlalchemy </span><span class="cx"> </span><span class="cx"> db = testbase.db </span><del>-testbase.echo=False </del><ins>+ </ins><span class="cx"> class DefaultTest(PersistTest): </span><span class="cx"> </span><span class="cx"> def setUpAll(self): </span></span></pre></div> <a id="sqlalchemybranchesschematestindexespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/indexes.py (1502 => 1503)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/indexes.py 2006-05-24 22:46:59 UTC (rev 1502) +++ sqlalchemy/branches/schema/test/indexes.py 2006-05-25 00:37:16 UTC (rev 1503) </span><span class="lines">@@ -67,7 +67,6 @@ </span><span class="cx"> stream = dummy() </span><span class="cx"> stream.write = capt.append </span><span class="cx"> testbase.db.logger = testbase.db.engine.logger = stream </span><del>- </del><span class="cx"> events = Table('events', metadata, </span><span class="cx"> Column('id', Integer, primary_key=True), </span><span class="cx"> Column('name', String(30), unique=True), </span></span></pre></div> <a id="sqlalchemybranchesschematesttestbasepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/test/testbase.py (1502 => 1503)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/test/testbase.py 2006-05-24 22:46:59 UTC (rev 1502) +++ sqlalchemy/branches/schema/test/testbase.py 2006-05-25 00:37:16 UTC (rev 1503) </span><span class="lines">@@ -9,13 +9,21 @@ </span><span class="cx"> import optparse </span><span class="cx"> </span><span class="cx"> </span><del>-echo = True -#echo = False -#echo = 'debug' </del><span class="cx"> db = None </span><span class="cx"> metadata = None </span><span class="cx"> db_uri = None </span><span class="cx"> </span><ins>+# redefine sys.stdout so all those print statements go to the echo func +local_stdout = sys.stdout +class Logger(object): + def write(self, msg): + if echo: + local_stdout.write(msg) +sys.stdout = Logger() + +def echo_text(text): + print text + </ins><span class="cx"> def parse_argv(): </span><span class="cx"> # we are using the unittest main runner, so we are just popping out the </span><span class="cx"> # arguments we need instead of using our own getopt type of thing </span><span class="lines">@@ -29,6 +37,8 @@ </span><span class="cx"> parser.add_option("--dburi", action="store", dest="dburi", help="database uri (overrides --db)") </span><span class="cx"> parser.add_option("--db", action="store", dest="db", default="sqlite", help="prefab database uri (sqlite, sqlite_file, postgres, mysql, oracle, oracle8, mssql)") </span><span class="cx"> parser.add_option("--mockpool", action="store_true", dest="mockpool", help="use mock pool") </span><ins>+ parser.add_option("--verbose", action="store_true", dest="verbose", help="full debug echoing") + parser.add_option("--quiet", action="store_true", dest="quiet", help="be totally quiet") </ins><span class="cx"> parser.add_option("--nothreadlocal", action="store_true", dest="nothreadlocal", help="dont use thread-local mod") </span><span class="cx"> parser.add_option("--enginestrategy", action="store", default=None, dest="enginestrategy", help="engine strategy (plain or threadlocal, defaults to SA default)") </span><span class="cx"> </span><span class="lines">@@ -66,12 +76,18 @@ </span><span class="cx"> __import__('sqlalchemy.mods.threadlocal') </span><span class="cx"> sqlalchemy.mods.threadlocal.uninstall_plugin() </span><span class="cx"> </span><ins>+ global echo + echo = options.verbose and not options.quiet + + global quiet + quiet = options.quiet + </ins><span class="cx"> if options.enginestrategy is not None: </span><span class="cx"> opts['strategy'] = options.enginestrategy </span><span class="cx"> if options.mockpool: </span><del>- db = engine.create_engine(db_uri, echo=echo, default_ordering=True, poolclass=MockPool, **opts) </del><ins>+ db = engine.create_engine(db_uri, echo=True, default_ordering=True, poolclass=MockPool, **opts) </ins><span class="cx"> else: </span><del>- db = engine.create_engine(db_uri, echo=echo, default_ordering=True, **opts) </del><ins>+ db = engine.create_engine(db_uri, echo=True, default_ordering=True, **opts) </ins><span class="cx"> db = EngineAssert(db) </span><span class="cx"> metadata = sqlalchemy.BoundMetaData(db) </span><span class="cx"> </span><span class="lines">@@ -103,16 +119,13 @@ </span><span class="cx"> return lala </span><span class="cx"> return decorate </span><span class="cx"> </span><del>-def echo_text(text): - print text </del><span class="cx"> </span><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><del>- if echo: - echo_text(text) </del><ins>+ echo_text(text) </ins><span class="cx"> def install_threadlocal(self): </span><span class="cx"> sqlalchemy.mods.threadlocal.install_plugin() </span><span class="cx"> def uninstall_threadlocal(self): </span><span class="lines">@@ -121,8 +134,10 @@ </span><span class="cx"> pass </span><span class="cx"> def tearDownAll(self): </span><span class="cx"> pass </span><ins>+ def shortDescription(self): + """overridden to not return docstrings""" + return None </ins><span class="cx"> </span><del>- </del><span class="cx"> class MockPool(pool.Pool): </span><span class="cx"> """this pool is hardcore about only one connection being used at a time.""" </span><span class="cx"> def __init__(self, creator, **params): </span><span class="lines">@@ -329,10 +344,11 @@ </span><span class="cx"> </span><span class="cx"> </span><span class="cx"> def runTests(suite): </span><del>- runner = unittest.TextTestRunner(verbosity = 2, descriptions =1) </del><ins>+ runner = unittest.TextTestRunner(verbosity = quiet and 1 or 2) </ins><span class="cx"> runner.run(suite) </span><span class="cx"> </span><span class="cx"> def main(): </span><del>- unittest.main() </del><ins>+ suite = unittest.TestLoader().loadTestsFromModule(__import__('__main__')) + runTests(suite) </ins><span class="cx"> </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |
