Skip to content

Commit 41a196d

Browse files
allmightyspiffallmightyspiff
authored
Merge pull request #1492 from allmightyspiff/1491
changed a testing domain to one that really doesnt exist
2 parents c187167 + d92a172 commit 41a196d

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎SoftLayer/transports.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,8 @@ def __call__(self, request):
395395
try:
396396
result = json.loads(resp.text)
397397
except ValueError as json_ex:
398-
raise exceptions.SoftLayerAPIError(resp.status_code, str(json_ex))
398+
LOGGER.warning(json_ex)
399+
raise exceptions.SoftLayerAPIError(resp.status_code, str(resp.text))
399400
else:
400401
raise exceptions.SoftLayerAPIError(resp.status_code, "Empty response.")
401402

@@ -413,8 +414,8 @@ def __call__(self, request):
413414
except ValueError as json_ex:
414415
if ex.response.text == "":
415416
raise exceptions.SoftLayerAPIError(resp.status_code, "Empty response.")
416-
417-
raise exceptions.SoftLayerAPIError(resp.status_code, str(json_ex))
417+
LOGGER.warning(json_ex)
418+
raise exceptions.SoftLayerAPIError(resp.status_code, ex.response.text)
418419

419420
raise exceptions.SoftLayerAPIError(ex.response.status_code, message)
420421
except requests.RequestException as ex:

‎tests/transport_tests.py‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class TestXmlRpcAPICall(testing.TestCase):
4040

4141
def set_up(self):
4242
self.transport = transports.XmlRpcTransport(
43-
endpoint_url='http://something.com',
43+
endpoint_url='http://something9999999999999999999999.com',
4444
)
4545
self.response = get_xmlrpc_response()
4646

@@ -71,7 +71,7 @@ def test_call(self, request):
7171
resp = self.transport(req)
7272

7373
request.assert_called_with('POST',
74-
'http://something.com/SoftLayer_Service',
74+
'http://something9999999999999999999999.com/SoftLayer_Service',
7575
headers={'Content-Type': 'application/xml',
7676
'User-Agent': consts.USER_AGENT},
7777
proxies=None,
@@ -123,7 +123,7 @@ def test_identifier(self, request):
123123
request.return_value = self.response
124124

125125
req = transports.Request()
126-
req.endpoint = "http://something.com"
126+
req.endpoint = "http://something9999999999999999999999.com"
127127
req.service = "SoftLayer_Service"
128128
req.method = "getObject"
129129
req.identifier = 1234
@@ -141,7 +141,7 @@ def test_filter(self, request):
141141
request.return_value = self.response
142142

143143
req = transports.Request()
144-
req.endpoint = "http://something.com"
144+
req.endpoint = "http://something9999999999999999999999.com"
145145
req.service = "SoftLayer_Service"
146146
req.method = "getObject"
147147
req.filter = {'TYPE': {'attribute': {'operation': '^= prefix'}}}
@@ -159,7 +159,7 @@ def test_limit_offset(self, request):
159159
request.return_value = self.response
160160

161161
req = transports.Request()
162-
req.endpoint = "http://something.com"
162+
req.endpoint = "http://something9999999999999999999999.com"
163163
req.service = "SoftLayer_Service"
164164
req.method = "getObject"
165165
req.limit = 10
@@ -179,7 +179,7 @@ def test_old_mask(self, request):
179179
request.return_value = self.response
180180

181181
req = transports.Request()
182-
req.endpoint = "http://something.com"
182+
req.endpoint = "http://something9999999999999999999999.com"
183183
req.service = "SoftLayer_Service"
184184
req.method = "getObject"
185185
req.mask = {"something": "nested"}
@@ -201,7 +201,7 @@ def test_mask_call_no_mask_prefix(self, request):
201201
request.return_value = self.response
202202

203203
req = transports.Request()
204-
req.endpoint = "http://something.com"
204+
req.endpoint = "http://something9999999999999999999999.com"
205205
req.service = "SoftLayer_Service"
206206
req.method = "getObject"
207207
req.mask = "something.nested"
@@ -217,7 +217,7 @@ def test_mask_call_v2(self, request):
217217
request.return_value = self.response
218218

219219
req = transports.Request()
220-
req.endpoint = "http://something.com"
220+
req.endpoint = "http://something9999999999999999999999.com"
221221
req.service = "SoftLayer_Service"
222222
req.method = "getObject"
223223
req.mask = "mask[something[nested]]"
@@ -233,7 +233,7 @@ def test_mask_call_filteredMask(self, request):
233233
request.return_value = self.response
234234

235235
req = transports.Request()
236-
req.endpoint = "http://something.com"
236+
req.endpoint = "http://something9999999999999999999999.com"
237237
req.service = "SoftLayer_Service"
238238
req.method = "getObject"
239239
req.mask = "filteredMask[something[nested]]"
@@ -249,7 +249,7 @@ def test_mask_call_v2_dot(self, request):
249249
request.return_value = self.response
250250

251251
req = transports.Request()
252-
req.endpoint = "http://something.com"
252+
req.endpoint = "http://something9999999999999999999999.com"
253253
req.service = "SoftLayer_Service"
254254
req.method = "getObject"
255255
req.mask = "mask.something.nested"
@@ -313,7 +313,7 @@ def test_ibm_id_call(self, auth, request):
313313

314314
auth.assert_called_with('apikey', '1234567890qweasdzxc')
315315
request.assert_called_with('POST',
316-
'http://something.com/SoftLayer_Service',
316+
'http://something9999999999999999999999.com/SoftLayer_Service',
317317
headers={'Content-Type': 'application/xml',
318318
'User-Agent': consts.USER_AGENT},
319319
proxies=None,
@@ -385,7 +385,7 @@ def test_verify(request,
385385
request.return_value = get_xmlrpc_response()
386386

387387
transport = transports.XmlRpcTransport(
388-
endpoint_url='http://something.com',
388+
endpoint_url='http://something9999999999999999999999.com',
389389
)
390390

391391
req = transports.Request()
@@ -401,7 +401,7 @@ def test_verify(request,
401401
transport(req)
402402

403403
request.assert_called_with('POST',
404-
'http://something.com/SoftLayer_Service',
404+
'http://something9999999999999999999999.com/SoftLayer_Service',
405405
data=mock.ANY,
406406
headers=mock.ANY,
407407
cert=mock.ANY,
@@ -415,7 +415,7 @@ class TestRestAPICall(testing.TestCase):
415415

416416
def set_up(self):
417417
self.transport = transports.RestTransport(
418-
endpoint_url='http://something.com',
418+
endpoint_url='http://something9999999999999999999999.com',
419419
)
420420

421421
@mock.patch('SoftLayer.transports.requests.Session.request')
@@ -435,7 +435,7 @@ def test_basic(self, request):
435435
self.assertIsInstance(resp, transports.SoftLayerListResult)
436436
self.assertEqual(resp.total_count, 10)
437437
request.assert_called_with(
438-
'GET', 'http://something.com/SoftLayer_Service/Resource.json',
438+
'GET', 'http://something9999999999999999999999.com/SoftLayer_Service/Resource.json',
439439
headers=mock.ANY,
440440
auth=None,
441441
data=None,
@@ -501,7 +501,6 @@ def test_proxy_without_protocol(self):
501501
req.service = 'SoftLayer_Service'
502502
req.method = 'Resource'
503503
req.proxy = 'localhost:3128'
504-
505504
try:
506505
self.assertRaises(SoftLayer.TransportError, self.transport, req)
507506
except AssertionError:
@@ -519,7 +518,7 @@ def test_valid_proxy(self, request):
519518
self.transport(req)
520519

521520
request.assert_called_with(
522-
'GET', 'http://something.com/SoftLayer_Service/Resource.json',
521+
'GET', 'http://something9999999999999999999999.com/SoftLayer_Service/Resource.json',
523522
proxies={'https': 'http://localhost:3128',
524523
'http': 'http://localhost:3128'},
525524
auth=None,
@@ -544,7 +543,7 @@ def test_with_id(self, request):
544543
self.assertEqual(resp, {})
545544
request.assert_called_with(
546545
'GET',
547-
'http://something.com/SoftLayer_Service/2/getObject.json',
546+
'http://something9999999999999999999999.com/SoftLayer_Service/2/getObject.json',
548547
headers=mock.ANY,
549548
auth=None,
550549
data=None,
@@ -568,7 +567,7 @@ def test_with_args(self, request):
568567
self.assertEqual(resp, {})
569568
request.assert_called_with(
570569
'POST',
571-
'http://something.com/SoftLayer_Service/getObject.json',
570+
'http://something9999999999999999999999.com/SoftLayer_Service/getObject.json',
572571
headers=mock.ANY,
573572
auth=None,
574573
data='{"parameters": ["test", 1]}',
@@ -592,7 +591,7 @@ def test_with_args_bytes(self, request):
592591
self.assertEqual(resp, {})
593592
request.assert_called_with(
594593
'POST',
595-
'http://something.com/SoftLayer_Service/getObject.json',
594+
'http://something9999999999999999999999.com/SoftLayer_Service/getObject.json',
596595
headers=mock.ANY,
597596
auth=None,
598597
data='{"parameters": ["test", "YXNkZg=="]}',
@@ -616,7 +615,7 @@ def test_with_filter(self, request):
616615
self.assertEqual(resp, {})
617616
request.assert_called_with(
618617
'GET',
619-
'http://something.com/SoftLayer_Service/getObject.json',
618+
'http://something9999999999999999999999.com/SoftLayer_Service/getObject.json',
620619
params={'objectFilter':
621620
'{"TYPE": {"attribute": {"operation": "^= prefix"}}}'},
622621
headers=mock.ANY,
@@ -641,7 +640,7 @@ def test_with_mask(self, request):
641640
self.assertEqual(resp, {})
642641
request.assert_called_with(
643642
'GET',
644-
'http://something.com/SoftLayer_Service/getObject.json',
643+
'http://something9999999999999999999999.com/SoftLayer_Service/getObject.json',
645644
params={'objectMask': 'mask[id,property]'},
646645
headers=mock.ANY,
647646
auth=None,
@@ -662,7 +661,7 @@ def test_with_mask(self, request):
662661
self.assertEqual(resp, {})
663662
request.assert_called_with(
664663
'GET',
665-
'http://something.com/SoftLayer_Service/getObject.json',
664+
'http://something9999999999999999999999.com/SoftLayer_Service/getObject.json',
666665
params={'objectMask': 'mask[id,property]'},
667666
headers=mock.ANY,
668667
auth=None,
@@ -688,7 +687,7 @@ def test_with_limit_offset(self, request):
688687
self.assertEqual(resp, {})
689688
request.assert_called_with(
690689
'GET',
691-
'http://something.com/SoftLayer_Service/2/getObject.json',
690+
'http://something9999999999999999999999.com/SoftLayer_Service/2/getObject.json',
692691
headers=mock.ANY,
693692
auth=None,
694693
data=None,
@@ -731,7 +730,7 @@ def test_with_special_auth(self, auth, request):
731730
auth.assert_called_with(user, password)
732731
request.assert_called_with(
733732
'GET',
734-
'http://something.com/SoftLayer_Service/2/getObject.json',
733+
'http://something9999999999999999999999.com/SoftLayer_Service/2/getObject.json',
735734
headers=mock.ANY,
736735
auth=mock.ANY,
737736
data=None,

0 commit comments

Comments
 (0)