Skip to content

Commit a61500e

Browse files
committed
Reverts tests because Requests 2.4.1 was released
1 parent 61d62f2 commit a61500e

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

SoftLayer/tests/functional_tests.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@ def test_no_hostname(self):
3737
# This test will fail if 'notvalidsoftlayer.com' becomes a thing
3838
SoftLayer.transports.make_xml_rpc_api_call(
3939
'http://notvalidsoftlayer.com', 'getObject')
40-
except Exception as ex:
41-
# NOTE(sudorandom): This used to be an instance of
42-
# SoftLayer.SoftLayerAPIError
43-
# Related issue: https://github.com/kennethreitz/requests/pull/2193
40+
except SoftLayer.SoftLayerAPIError as ex:
4441
self.assertIn('not known', str(ex))
42+
self.assertIn('not known', ex.faultString)
43+
self.assertEqual(ex.faultCode, 0)
4544
else:
4645
self.fail('No Exception Raised')
4746

SoftLayer/tests/transport_tests.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,8 @@ def test_call(self, request):
6060
self.assertEqual(resp, [])
6161

6262
def test_proxy_without_protocol(self):
63-
# NOTE(sudorandom): This used to be an instance of requests.HTTPError,
64-
# but something changes in requests to make that no
65-
# longer the case.
66-
# Related issue:
67-
# https://github.com/kennethreitz/requests/pull/2193
6863
self.assertRaises(
69-
Exception, # NOQA
64+
SoftLayer.TransportError, # NOQA
7065
transports.make_xml_rpc_api_call,
7166
'http://something.com/path/to/resource',
7267
'getObject',

0 commit comments

Comments
 (0)