Merge "Use python-six shim for assertRaisesRegex/p"

2015-06-18 02:12:05 +00:00
parent 4547767eb2 2a032a5f37
commit 56a7d0b52c
1 changed files with 5 additions and 4 deletions
--- a/keystoneclient/tests/unit/test_session.py
+++ b/keystoneclient/tests/unit/test_session.py
@@ -244,10 +244,11 @@ class SessionTests(utils.TestCase):
        # The exception should contain the URL and details about the SSL error
        msg = _('SSL exception connecting to %(url)s: %(error)s') % {
            'url': self.TEST_URL, 'error': error}
-        self.assertRaisesRegex(exceptions.SSLError,
-                               msg,
-                               session.get,
-                               self.TEST_URL)
+        six.assertRaisesRegex(self,
+                              exceptions.SSLError,
+                              msg,
+                              session.get,
+                              self.TEST_URL)


 class RedirectTests(utils.TestCase):