diff --git a/keystoneclient/tests/test_auth_token_middleware.py b/keystoneclient/tests/test_auth_token_middleware.py index adf952bc..8fd92d25 100644 --- a/keystoneclient/tests/test_auth_token_middleware.py +++ b/keystoneclient/tests/test_auth_token_middleware.py @@ -315,33 +315,6 @@ class BaseAuthTokenMiddlewareTest(testtools.TestCase): self.assertIsInstance(httpretty.last_request(), httpretty.core.HTTPrettyRequestEmpty) -if tuple(sys.version_info)[0:2] < (2, 7): - - # 2.6 doesn't have the assert dict equals so make sure that it exists - class AdjustedBaseAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest): - def assertIsInstance(self, obj, cls, msg=None): - """Same as self.assertTrue(isinstance(obj, cls)), with a nicer - default message. - """ - if not isinstance(obj, cls): - standardMsg = '%s is not an instance of %r' % (obj, cls) - self.fail(self._formatMessage(msg, standardMsg)) - - def assertDictEqual(self, d1, d2, msg=None): - # Simple version taken from 2.7 - self.assertIsInstance(d1, dict, - 'First argument is not a dictionary') - self.assertIsInstance(d2, dict, - 'Second argument is not a dictionary') - if d1 != d2: - if msg: - self.fail(msg) - else: - standardMsg = '%r != %r' % (d1, d2) - self.fail(standardMsg) - - BaseAuthTokenMiddlewareTest = AdjustedBaseAuthTokenMiddlewareTest - class MultiStepAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest, testresources.ResourcedTestCase):