From f1885f0b7c55c488d479f649e0b9d7990fc85d74 Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Wed, 30 Sep 2015 05:19:40 +1000 Subject: [PATCH] Add UnknownConnectionError to __all__ Because UnknownConnectionError is not in __all__ it doesn't get imported into the keystoneauth1.exceptions module and so it can't be used from the session module. Change-Id: I16061ee55871fc0eeaab752f21637d52158055fc Closes-Bug: #1501022 --- keystoneauth1/exceptions/connection.py | 3 ++- keystoneauth1/tests/unit/test_session.py | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/keystoneauth1/exceptions/connection.py b/keystoneauth1/exceptions/connection.py index 19db8bf5..769a875d 100644 --- a/keystoneauth1/exceptions/connection.py +++ b/keystoneauth1/exceptions/connection.py @@ -17,7 +17,8 @@ __all__ = ['ConnectionError', 'ConnectTimeout', 'ConnectFailure', 'SSLError', - 'RetriableConnectionFailure'] + 'RetriableConnectionFailure', + 'UnknownConnectionError'] class RetriableConnectionFailure(Exception): diff --git a/keystoneauth1/tests/unit/test_session.py b/keystoneauth1/tests/unit/test_session.py index bbc41bdc..c5a090c3 100644 --- a/keystoneauth1/tests/unit/test_session.py +++ b/keystoneauth1/tests/unit/test_session.py @@ -814,3 +814,10 @@ class AdapterTest(utils.TestCase): self.assertNotIn(self.TEST_URL, self.logger.output) self.assertNotIn(response, self.logger.output) + + def test_unknown_connection_error(self): + self.stub_url('GET', exc=requests.exceptions.RequestException) + self.assertRaises(exceptions.UnknownConnectionError, + client_session.Session().request, + self.TEST_URL, + 'GET')