transport coverage

Author: allmightyspiff

SoftLayer/transports.py

@@ -309,11 +309,10 @@ def __call__(self, request):
             request.mask = _format_object_mask(request.mask)
             params['objectMask'] = request.mask
 
-        if request.limit:
-            params['limit'] = request.limit
-
-        if request.offset:
-            params['offset'] = request.offset
+        if request.limit or request.offset:
+            limit = request.limit  or 0 
+            offset = request.offset or 0 
+            params['resultLimit'] = "%d,%d" % (offset,limit)
 
         if request.filter:
             params['objectFilter'] = json.dumps(request.filter)

tests/transport_tests.py

@@ -257,6 +257,15 @@ def test_request_exception(self, request):
         self.assertRaises(SoftLayer.TransportError, self.transport, req)
 
 
+    def test_print_reproduceable(self):
+        req = transports.Request()
+        req.url = "https://test.com"
+        req.payload = "testing"
+        req.transport_headers = {"test-headers" : 'aaaa'}
+        output_text = self.transport.print_reproduceable(req)
+        self.assertIn("https://test.com", output_text)
+
+
 @mock.patch('SoftLayer.transports.requests.Session.request')
 @pytest.mark.parametrize(
     "transport_verify,request_verify,expected",
@@ -529,7 +538,7 @@ def test_with_limit_offset(self, request):
             headers=mock.ANY,
             auth=None,
             data=None,
-            params={'limit': 10, 'offset': 5},
+            params={'resultLimit': '5,10'},
             verify=True,
             cert=None,
             proxies=None,
@@ -578,6 +587,13 @@ def test_with_special_auth(self, auth, request):
             proxies=None,
             timeout=None)
 
+    def test_print_reproduceable(self):
+        req = transports.Request()
+        req.url = "https://test.com"
+        req.payload = "testing"
+        req.transport_headers = {"test-headers" : 'aaaa'}
+        output_text = self.transport.print_reproduceable(req)
+        self.assertIn("https://test.com", output_text)
 
 class TestFixtureTransport(testing.TestCase):
 
@@ -602,3 +618,104 @@ def test_no_method(self):
         req.service = 'SoftLayer_Account'
         req.method = 'getObjectzzzz'
         self.assertRaises(NotImplementedError, self.transport, req)
+
+class TestTimingTransport(testing.TestCase):
+
+
+    def set_up(self):
+        fixture_transport = transports.FixtureTransport()
+        self.transport = transports.TimingTransport(fixture_transport)
+
+    def test_call(self):
+        req = transports.Request()
+        req.service = 'SoftLayer_Account'
+        req.method = 'getObject'
+        resp = self.transport(req)
+        self.assertEqual(resp['accountId'], 1234)
+
+    def test_get_last_calls(self):
+        req = transports.Request()
+        req.service = 'SoftLayer_Account'
+        req.method = 'getObject'
+        resp = self.transport(req)
+        self.assertEqual(resp['accountId'], 1234)
+        calls = self.transport.get_last_calls()
+        self.assertEqual(calls[0][0].service, 'SoftLayer_Account')
+
+    def test_print_reproduceable(self):
+        req = transports.Request()
+        req.service = 'SoftLayer_Account'
+        req.method = 'getObject'
+        output_text = self.transport.print_reproduceable(req)
+        self.assertEqual('SoftLayer_Account', output_text)
+
+class TestDebugTransport(testing.TestCase):
+
+
+    def set_up(self):
+        fixture_transport = transports.FixtureTransport()
+        self.transport = transports.DebugTransport(fixture_transport)
+        req = transports.Request()
+        req.service = 'SoftLayer_Account'
+        req.method = 'getObject'
+        self.req = req
+
+    def test_call(self):
+
+        resp = self.transport(self.req)
+        self.assertEqual(resp['accountId'], 1234)
+
+    def test_get_last_calls(self):
+
+        resp = self.transport(self.req)
+        self.assertEqual(resp['accountId'], 1234)
+        calls = self.transport.get_last_calls()
+        self.assertEqual(calls[0].service, 'SoftLayer_Account')
+
+    def test_print_reproduceable(self):
+        req = transports.Request()
+        req.service = 'SoftLayer_Account'
+        req.method = 'getObject'
+        output_text = self.transport.print_reproduceable(self.req)
+        self.assertEqual('SoftLayer_Account', output_text)
+
+    def test_print_reproduceable_post(self):
+        req = transports.Request()
+        req.url = "https://test.com"
+        req.payload = "testing"
+        req.transport_headers = {"test-headers" : 'aaaa'}
+        req.args = 'createObject'
+
+        rest_transport = transports.RestTransport()
+        transport = transports.DebugTransport(rest_transport)
+
+        output_text = transport.print_reproduceable(req)
+
+        self.assertIn("https://test.com", output_text)
+        self.assertIn("-X POST", output_text)
+
+
+    @mock.patch('SoftLayer.transports.requests.Session.request')
+    def test_error(self, request):
+        # Test JSON Error
+        e = requests.HTTPError('error')
+        e.response = mock.MagicMock()
+        e.response.status_code = 404
+        e.response.text = '''{
+            "error": "description",
+            "code": "Error Code"
+        }'''
+        request().raise_for_status.side_effect = e
+
+        req = transports.Request()
+        req.service = 'SoftLayer_Service'
+        req.method = 'Resource'
+        rest_transport = transports.RestTransport()
+        transport = transports.DebugTransport(rest_transport)
+        self.assertRaises(SoftLayer.SoftLayerAPIError, transport, req)
+        calls = transport.get_last_calls()
+        self.assertEqual(404, calls[0].exception.faultCode)
+
+
+
+