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:17 UTC
[11/46] libcloud git commit: fix cloudstack common tests,
3rd tuple is headers
fix cloudstack common tests, 3rd tuple is headers
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/67f55eef
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/67f55eef
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/67f55eef
Branch: refs/heads/trunk
Commit: 67f55eef56a470fdd487caef3b9f70813642a236
Parents: d8595be
Author: Anthony Shaw <an...@apache.org>
Authored: Tue Apr 11 13:36:13 2017 +1000
Committer: Anthony Shaw <an...@apache.org>
Committed: Tue Apr 11 13:36:13 2017 +1000
----------------------------------------------------------------------
libcloud/test/__init__.py | 1 -
libcloud/test/common/test_cloudstack.py | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/67f55eef/libcloud/test/__init__.py
----------------------------------------------------------------------
diff --git a/libcloud/test/__init__.py b/libcloud/test/__init__.py
index be75456..2f97f7c 100644
--- a/libcloud/test/__init__.py
+++ b/libcloud/test/__init__.py
@@ -149,7 +149,6 @@ class MockHttp(LibcloudConnection):
def request(self, method, url, body=None, headers=None, raw=False, stream=False):
r_status, r_body, r_headers, r_reason = self._get_request(method, url, body, headers)
-
with requests_mock.mock() as m:
m.register_uri(method, url, text=r_body, reason=r_reason,
headers=r_headers, status_code=r_status)
http://git-wip-us.apache.org/repos/asf/libcloud/blob/67f55eef/libcloud/test/common/test_cloudstack.py
----------------------------------------------------------------------
diff --git a/libcloud/test/common/test_cloudstack.py b/libcloud/test/common/test_cloudstack.py
index 0b59f01..89c50b7 100644
--- a/libcloud/test/common/test_cloudstack.py
+++ b/libcloud/test/common/test_cloudstack.py
@@ -129,7 +129,7 @@ class CloudStackMockHttp(MockHttpTestCase):
ERROR_TEXT = 'ERROR TEXT'
def _response(self, status, result, response):
- return (status, json.dumps(result), result, response)
+ return (status, json.dumps(result), {}, response)
def _check_request(self, url):
url = urlparse.urlparse(url)