You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2017/04/13 09:33:12 UTC
[06/46] libcloud git commit: fix openstack tests. remove raw response
mocks and storage mocks
fix openstack tests. remove raw response mocks and storage mocks
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/8701590f
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/8701590f
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/8701590f
Branch: refs/heads/trunk
Commit: 8701590f55a4f1eb2f1dd2db2a1de7a69f69530c
Parents: 16fccdf
Author: Anthony Shaw <an...@apache.org>
Authored: Tue Apr 11 11:14:32 2017 +1000
Committer: Anthony Shaw <an...@apache.org>
Committed: Tue Apr 11 11:14:32 2017 +1000
----------------------------------------------------------------------
libcloud/test/__init__.py | 19 -------------------
libcloud/test/compute/test_base.py | 5 -----
libcloud/test/compute/test_dimensiondata_v2_3.py | 12 +++---------
libcloud/test/compute/test_openstack.py | 8 ++++----
4 files changed, 7 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/8701590f/libcloud/test/__init__.py
----------------------------------------------------------------------
diff --git a/libcloud/test/__init__.py b/libcloud/test/__init__.py
index 29ee365..f75991f 100644
--- a/libcloud/test/__init__.py
+++ b/libcloud/test/__init__.py
@@ -229,25 +229,6 @@ class MockConnection(object):
self.action = action
-class StorageMockHttp(MockHttp):
- def prepared_request(self, method, url, body=None, headers=None, raw=False,
- stream=False):
- self.action = url
- self.response = self.rawResponseCls(self)
-
- def putrequest(self, method, action, skip_host=0, skip_accept_encoding=0):
- pass
-
- def putheader(self, key, value):
- pass
-
- def endheaders(self):
- pass
-
- def send(self, data):
- pass
-
-
if __name__ == "__main__":
import doctest
doctest.testmod()
http://git-wip-us.apache.org/repos/asf/libcloud/blob/8701590f/libcloud/test/compute/test_base.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_base.py b/libcloud/test/compute/test_base.py
index 5173cf9..aa506b0 100644
--- a/libcloud/test/compute/test_base.py
+++ b/libcloud/test/compute/test_base.py
@@ -22,8 +22,6 @@ from libcloud.compute.base import Node, NodeSize, NodeImage, NodeDriver, Storage
from libcloud.compute.base import NodeAuthSSHKey, NodeAuthPassword
from libcloud.compute.types import StorageVolumeState
-from libcloud.test import MockResponse # pylint: disable-msg=E0611
-
class FakeDriver(object):
type = 0
@@ -45,9 +43,6 @@ class BaseTests(unittest.TestCase):
def test_base_storage_volume(self):
StorageVolume(id="0", name="0", size=10, driver=FakeDriver(), state=StorageVolumeState.AVAILABLE)
- def test_base_response(self):
- Response(MockResponse(status=200, body='foo'), ConnectionKey('foo'))
-
def test_base_node_driver(self):
NodeDriver('foo')
http://git-wip-us.apache.org/repos/asf/libcloud/blob/8701590f/libcloud/test/compute/test_dimensiondata_v2_3.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_dimensiondata_v2_3.py b/libcloud/test/compute/test_dimensiondata_v2_3.py
index e48f615..f181320 100644
--- a/libcloud/test/compute/test_dimensiondata_v2_3.py
+++ b/libcloud/test/compute/test_dimensiondata_v2_3.py
@@ -33,7 +33,7 @@ from libcloud.common.dimensiondata import TYPES_URN
from libcloud.compute.drivers.dimensiondata import DimensionDataNodeDriver as DimensionData
from libcloud.compute.drivers.dimensiondata import DimensionDataNic
from libcloud.compute.base import Node, NodeAuthPassword, NodeLocation
-from libcloud.test import MockHttp, unittest, MockRawResponse, StorageMockHttp
+from libcloud.test import MockHttp, unittest
from libcloud.test.compute import TestCaseMixin
from libcloud.test.file_fixtures import ComputeFileFixtures
from libcloud.test.secrets import DIMENSIONDATA_PARAMS
@@ -45,8 +45,6 @@ class DimensionData_v2_3_Tests(unittest.TestCase, TestCaseMixin):
def setUp(self):
DimensionData.connectionCls.active_api_version = '2.3'
DimensionData.connectionCls.conn_class = DimensionDataMockHttp
- DimensionData.connectionCls.rawResponseCls = \
- DimensionDataMockRawResponse
DimensionDataMockHttp.type = None
self.driver = DimensionData(*DIMENSIONDATA_PARAMS)
@@ -2034,7 +2032,8 @@ class InvalidRequestError(Exception):
super(InvalidRequestError, self).__init__("Invalid Request - %s" % tag)
-class DimensionDataMockRawResponse(MockRawResponse):
+class DimensionDataMockHttp(MockHttp):
+
fixtures = ComputeFileFixtures('dimensiondata')
def _oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_report_usage(self, method, url, body, headers):
@@ -2055,11 +2054,6 @@ class DimensionDataMockRawResponse(MockRawResponse):
)
return (httplib.BAD_REQUEST, body, {}, httplib.responses[httplib.OK])
-
-class DimensionDataMockHttp(StorageMockHttp, MockHttp):
-
- fixtures = ComputeFileFixtures('dimensiondata')
-
def _oec_0_9_myaccount_UNAUTHORIZED(self, method, url, body, headers):
return (httplib.UNAUTHORIZED, "", {}, httplib.responses[httplib.UNAUTHORIZED])
http://git-wip-us.apache.org/repos/asf/libcloud/blob/8701590f/libcloud/test/compute/test_openstack.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_openstack.py b/libcloud/test/compute/test_openstack.py
index 77211ff..ea85ca8 100644
--- a/libcloud/test/compute/test_openstack.py
+++ b/libcloud/test/compute/test_openstack.py
@@ -46,7 +46,7 @@ from libcloud.compute.drivers.openstack import (
from libcloud.compute.base import Node, NodeImage, NodeSize
from libcloud.pricing import set_pricing, clear_pricing_data
-from libcloud.common.base import Response as MockResponse
+from libcloud.common.base import Response
from libcloud.test import MockHttpTestCase, XML_HEADERS
from libcloud.test.file_fixtures import ComputeFileFixtures, OpenStackFixtures
from libcloud.test.compute import TestCaseMixin
@@ -60,14 +60,14 @@ class OpenStack_1_0_ResponseTestCase(unittest.TestCase):
XML = """<?xml version="1.0" encoding="UTF-8"?><root/>"""
def test_simple_xml_content_type_handling(self):
- http_response = MockResponse(
+ http_response = Response(
200, OpenStack_1_0_ResponseTestCase.XML, headers={'content-type': 'application/xml'})
body = OpenStack_1_0_Response(http_response, None).parse_body()
self.assertTrue(hasattr(body, 'tag'), "Body should be parsed as XML")
def test_extended_xml_content_type_handling(self):
- http_response = MockResponse(200,
+ http_response = Response(200,
OpenStack_1_0_ResponseTestCase.XML,
headers={'content-type': 'application/xml; charset=UTF-8'})
body = OpenStack_1_0_Response(http_response, None).parse_body()
@@ -77,7 +77,7 @@ class OpenStack_1_0_ResponseTestCase(unittest.TestCase):
def test_non_xml_content_type_handling(self):
RESPONSE_BODY = "Accepted"
- http_response = MockResponse(
+ http_response = Response(
202, RESPONSE_BODY, headers={'content-type': 'text/html'})
body = OpenStack_1_0_Response(http_response, None).parse_body()