remove TrialTestCase again and fix merge issues

This commit is contained in:
Vishvananda Ishaya
2011-01-14 11:00:47 -08:00
parent 8db70fa374
commit e2baa53409
4 changed files with 8 additions and 8 deletions

View File

@@ -38,7 +38,7 @@ def conditional_forbid(req):
return 'OK'
class LockoutTestCase(test.TrialTestCase):
class LockoutTestCase(test.TestCase):
"""Test case for the Lockout middleware."""
def setUp(self): # pylint: disable-msg=C0103
super(LockoutTestCase, self).setUp()