From c298a9f4e8c4ed9a7f1735ae0998fca0dd346510 Mon Sep 17 00:00:00 2001 From: Scott Torborg Date: Wed, 4 Nov 2009 21:32:09 -1000 Subject: [PATCH] fix tests and make them more resilient --- bluechips/tests/functional/test_spend.py | 12 +++++++----- bluechips/tests/functional/test_transfer.py | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/bluechips/tests/functional/test_spend.py b/bluechips/tests/functional/test_spend.py index 940a015..7c510f9 100644 --- a/bluechips/tests/functional/test_spend.py +++ b/bluechips/tests/functional/test_spend.py @@ -28,7 +28,7 @@ class TestSpendController(TestController): response = form.submit() response = response.follow() - response.mustcontain('Expenditure updated.') + response.mustcontain('Expenditure', 'created.') e = meta.Session.query(model.Expenditure).\ order_by(model.Expenditure.id.desc()).first() @@ -36,8 +36,6 @@ class TestSpendController(TestController): assert e.amount == 6678 assert e.date == today assert e.description == u'A test expenditure' - meta.Session.delete(e) - meta.Session.commit() # Test the split. @@ -67,10 +65,14 @@ class TestSpendController(TestController): response = form.submit() response = response.follow() - response.mustcontain('Expenditure updated.') + response.mustcontain('Expenditure', 'updated.') e = meta.Session.query(model.Expenditure).\ order_by(model.Expenditure.id.desc()).first() assert e.description == u'Updated bundt cake' - meta.Session.delete(e) + + def tearDown(self): + expenditures = meta.Session.query(model.Expenditure).all() + for e in expenditures: + meta.Session.delete(e) meta.Session.commit() diff --git a/bluechips/tests/functional/test_transfer.py b/bluechips/tests/functional/test_transfer.py index 36a6bb8..d9032a4 100644 --- a/bluechips/tests/functional/test_transfer.py +++ b/bluechips/tests/functional/test_transfer.py @@ -28,7 +28,7 @@ class TestTransferController(TestController): response = form.submit() response = response.follow() - response.mustcontain('Transfer updated.') + response.mustcontain('Transfer', 'created.') t = meta.Session.query(model.Transfer).\ order_by(model.Transfer.id.desc()).first() @@ -37,8 +37,6 @@ class TestTransferController(TestController): assert t.amount == 12345 assert t.date == today assert t.description == u'A test transfer from Rich to Ben' - meta.Session.delete(t) - meta.Session.commit() def test_edit(self): user_rich = meta.Session.query(model.User).\ @@ -66,10 +64,14 @@ class TestTransferController(TestController): response = form.submit() response = response.follow() - response.mustcontain('Transfer updated.') + response.mustcontain('Transfer', 'updated.') t = meta.Session.query(model.Transfer).\ order_by(model.Transfer.id.desc()).first() assert t.description == u'A new description' - meta.Session.delete(t) + + def tearDown(self): + transfers = meta.Session.query(model.Transfer).all() + for t in transfers: + meta.Session.delete(t) meta.Session.commit() -- 2.45.2