Return-Path: X-Original-To: apmail-libcloud-commits-archive@www.apache.org Delivered-To: apmail-libcloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 237611089F for ; Sat, 15 Jun 2013 06:28:28 +0000 (UTC) Received: (qmail 70559 invoked by uid 500); 15 Jun 2013 06:28:27 -0000 Delivered-To: apmail-libcloud-commits-archive@libcloud.apache.org Received: (qmail 70405 invoked by uid 500); 15 Jun 2013 06:28:25 -0000 Mailing-List: contact commits-help@libcloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@libcloud.apache.org Delivered-To: mailing list commits@libcloud.apache.org Received: (qmail 70076 invoked by uid 99); 15 Jun 2013 06:28:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Jun 2013 06:28:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EE64D881F00; Sat, 15 Jun 2013 06:28:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tomaz@apache.org To: commits@libcloud.apache.org Date: Sat, 15 Jun 2013 06:28:23 -0000 Message-Id: In-Reply-To: <33cd0b7e419943108445a2e27bca9d55@git.apache.org> References: <33cd0b7e419943108445a2e27bca9d55@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/14] git commit: Update affected test and mockhttp class. Update affected test and mockhttp class. Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/9bf618c4 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/9bf618c4 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/9bf618c4 Branch: refs/heads/0.12.x Commit: 9bf618c4b79379cc584f8d293974eefda3939741 Parents: fd76cf6 Author: Tomaz Muraus Authored: Fri Jun 14 23:05:47 2013 -0700 Committer: Tomaz Muraus Committed: Fri Jun 14 23:22:17 2013 -0700 ---------------------------------------------------------------------- libcloud/test/__init__.py | 4 ++-- libcloud/test/compute/test_brightbox.py | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/9bf618c4/libcloud/test/__init__.py ---------------------------------------------------------------------- diff --git a/libcloud/test/__init__.py b/libcloud/test/__init__.py index c6c8dff..20c8a75 100644 --- a/libcloud/test/__init__.py +++ b/libcloud/test/__init__.py @@ -77,9 +77,9 @@ class MockResponse(object): reason = '' version = 11 - def __init__(self, status, body, headers=None, reason=None): + def __init__(self, status, body=None, headers=None, reason=None): self.status = status - self.body = StringIO(u(body)) + self.body = StringIO(u(body)) if body else StringIO() self.headers = headers or self.headers self.reason = reason or self.reason http://git-wip-us.apache.org/repos/asf/libcloud/blob/9bf618c4/libcloud/test/compute/test_brightbox.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_brightbox.py b/libcloud/test/compute/test_brightbox.py index 95c0648..b9f3ce2 100644 --- a/libcloud/test/compute/test_brightbox.py +++ b/libcloud/test/compute/test_brightbox.py @@ -285,13 +285,16 @@ class BrightboxMockHttp(MockHttp): return self.response(httplib.OK, self.fixtures.load('list_zones.json')) def _2_0_zones(self, method, url, body, headers): return self.response(httplib.BAD_REQUEST, '{"error_name":"unrecognised_endpoint", "errors": ["The request was for an unrecognised API endpoint"]}') - + def _1_0_cloud_ips(self, method, url, body, headers): if method == 'GET': return self.response(httplib.OK, self.fixtures.load('list_cloud_ips.json')) elif method == 'POST': - body = json.loads(body) + if body: + body = json.loads(body) + node = json.loads(self.fixtures.load('create_cloud_ip.json')) + if 'reverse_dns' in body: node['reverse_dns'] = body['reverse_dns'] return self.response(httplib.ACCEPTED, json.dumps(node)) @@ -305,7 +308,7 @@ class BrightboxMockHttp(MockHttp): return self.response(httplib.OK, '') else: return self.response(httplib.BAD_REQUEST, '{"error_name":"bad dns", "errors": ["Bad dns"]}') - + def _1_0_cloud_ips_cip_jsjc5_map(self, method, url, body, headers): if method == 'POST': body = json.loads(body)