Author: phd
Date: Tue Oct 9 08:11:51 2012
New Revision: 4560
Log:
Merged revision 4558 from branch 1.2: recreate existing tables
in case the tests run for the 2nd time (Neil Muller).
Modified:
SQLObject/trunk/sqlobject/tests/test_asdict.py
SQLObject/trunk/sqlobject/tests/test_comparison.py
Modified: SQLObject/trunk/sqlobject/tests/test_asdict.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_asdict.py Tue Oct 9 08:11:30 2012 (r4559)
+++ SQLObject/trunk/sqlobject/tests/test_asdict.py Tue Oct 9 08:11:51 2012 (r4560)
@@ -10,6 +10,6 @@
name2 = StringCol(length=10)
def test_asDict():
- setupClass(TestAsDict)
+ setupClass(TestAsDict, force=True)
t1 = TestAsDict(name='one', name2='1')
assert t1.sqlmeta.asDict() == dict(name='one', name2='1', id=1)
Modified: SQLObject/trunk/sqlobject/tests/test_comparison.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_comparison.py Tue Oct 9 08:11:30 2012 (r4559)
+++ SQLObject/trunk/sqlobject/tests/test_comparison.py Tue Oct 9 08:11:51 2012 (r4560)
@@ -5,7 +5,7 @@
pass
def test_eq():
- setupClass(TestComparison)
+ setupClass(TestComparison, force=True)
t1 = TestComparison()
t2 = TestComparison()
|