Skip to content

Commit 359de61

Browse files
ianbianb
committed
More fixes to the tests to create/destroy classes in the right order.
git-svn-id: http://svn.colorstudy.com/trunk/SQLObject@581 95a46c32-92d2-0310-94a5-8d71aeb3d4b3
1 parent fb57c93 commit 359de61

3 files changed

Lines changed: 3 additions & 6 deletions

File tree

‎sqlobject/tests/test_distinct.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ def count(select):
1818
return result
1919

2020
def test_distinct():
21-
setupClass(Distinct1)
22-
setupClass(Distinct2)
21+
setupClass([Distinct1, Distinct2])
2322
obs = [Distinct1(n=i) for i in range(3)]
2423
Distinct2(other=obs[0])
2524
Distinct2(other=obs[0])

‎sqlobject/tests/test_joins.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ class AddressJoiner2(SQLObject):
7676
class TestJoin2:
7777

7878
def setup_method(self, meth):
79-
setupClass(PersonJoiner2)
80-
setupClass(AddressJoiner2)
79+
setupClass([PersonJoiner2, AddressJoiner2])
8180
p1 = PersonJoiner2(name='bob')
8281
p2 = PersonJoiner2(name='sally')
8382
for z in ['11111', '22222', '33333']:

‎sqlobject/tests/test_style.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ class SOStyleTest2(SQLObject):
1919
_style = AnotherStyle()
2020

2121
def test_style():
22-
setupClass(SOStyleTest2)
23-
setupClass(SOStyleTest1)
22+
setupClass([SOStyleTest2, SOStyleTest1])
2423
st1 = SOStyleTest1(a='something', st2=None)
2524
st2 = SOStyleTest2(b='whatever')
2625
st1.st2 = st2

0 commit comments

Comments
 (0)