[grassyknoll commit] r961 - in branches/unhork/grassyknoll: backend/sql tests

[codesite...@google.com]

Author: jemfinch
Date: Mon Dec 29 08:26:55 2008
New Revision: 961

Modified:
branches/unhork/grassyknoll/backend/sql/TableMaker.py
branches/unhork/grassyknoll/tests/test_TableMaker.py

Log:
Issue #161: Fixed doctest failures in TableMaker.

Modified: branches/unhork/grassyknoll/backend/sql/TableMaker.py
==============================================================================
--- branches/unhork/grassyknoll/backend/sql/TableMaker.py (original)
+++ branches/unhork/grassyknoll/backend/sql/TableMaker.py Mon Dec 29
08:26:55 2008
@@ -173,7 +173,7 @@

def show(self):
# need to use instead of return b/c build doesn't return anything
- def print_(x): print x
+ def print_(x): print x.rstrip() # Remove trailing newlines/spaces
for doctests.
return self.build(print_)

if __name__ == '__main__':

Modified: branches/unhork/grassyknoll/tests/test_TableMaker.py
==============================================================================
--- branches/unhork/grassyknoll/tests/test_TableMaker.py (original)
+++ branches/unhork/grassyknoll/tests/test_TableMaker.py Mon Dec 29
08:26:55 2008
@@ -15,7 +15,7 @@
assert not TableMaker.validSqlColumn('PRIMARY')

def test_Column():
- assert_raises(Exception, TableMaker.Column, 'invalid type')
+ assert_raises(Exception, TableMaker.Column, None) # None is an invalid
type.

def test_TableMultiIndex():
t = TableMaker.Table('foo')