Save test_auth_token_middleware from unlimited recursion
For Python 2.6, BaseAuthTokenMiddlewareTest will be equal to AdjustedBaseAuthTokenMiddlewareTest in BaseAuthTokenMiddlewareTest.setUp thus leading to infinite recursion. Also, parent's setUp was incorrectly called by BaseAuthTokenMiddlewareTest.setUp twice: at the beginning and at the end of the function. Change-Id: I63fce65866ef9d8aebe9eb60f7ceb17463de0989 Fixes: bug #1130200
This commit is contained in:
@@ -363,7 +363,7 @@ class FakeApp(object):
|
||||
class BaseAuthTokenMiddlewareTest(testtools.TestCase):
|
||||
|
||||
def setUp(self, expected_env=None):
|
||||
super(BaseAuthTokenMiddlewareTest, self).setUp()
|
||||
testtools.TestCase.setUp(self)
|
||||
expected_env = expected_env or {}
|
||||
|
||||
conf = {
|
||||
@@ -390,10 +390,8 @@ class BaseAuthTokenMiddlewareTest(testtools.TestCase):
|
||||
valid_signed_list = 'VALID_SIGNED_REVOCATION_LIST'
|
||||
globals()[signed_list] = globals()[valid_signed_list]
|
||||
|
||||
super(BaseAuthTokenMiddlewareTest, self).setUp()
|
||||
|
||||
def tearDown(self):
|
||||
super(BaseAuthTokenMiddlewareTest, self).tearDown()
|
||||
testtools.TestCase.tearDown(self)
|
||||
try:
|
||||
os.remove(self.middleware.revoked_file_name)
|
||||
except OSError:
|
||||
|
Reference in New Issue
Block a user