From e5a193ac43fbae82dc01703df1e634272363fedb Mon Sep 17 00:00:00 2001
From: Kui Shi <skuicloud@gmail.com>
Date: Thu, 3 Oct 2013 21:32:22 +0800
Subject: [PATCH] py33: unify the input of request to json format
In novaclient.client.HTTPClient.request, json.dumps() process the
body of "POST":
kwargs['data'] = json.dumps(kwargs['body'])
So, in test case, we should pass the same forat for mock.call().
Also, transform the "data" variable to json format.
Close-Bug #1234067
Change-Id: I3a0abaa8064b4360cb94b7b205454e26bddef8e4
---
novaclient/tests/test_client.py | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/novaclient/tests/test_client.py b/novaclient/tests/test_client.py
index 362901e21..45c05e459 100644
--- a/novaclient/tests/test_client.py
+++ b/novaclient/tests/test_client.py
@@ -24,6 +24,8 @@ import novaclient.v1_1.client
import novaclient.v3.client
from novaclient.tests import utils
+import json
+
class ClientTest(utils.TestCase):
@@ -71,8 +73,16 @@ class ClientTest(utils.TestCase):
reauth_headers = {'Content-Type': 'application/json',
'Accept': 'application/json',
'User-Agent': 'python-novaclient'}
- data = ('{"auth": {"tenantName": "project", "passwordCredentials":'
- ' {"username": "user", "password": "password"}}}')
+ data = {
+ "auth": {
+ "tenantName": "project",
+ "passwordCredentials": {
+ "username": "user",
+ "password": "password"
+ }
+ }
+ }
+
expected = [mock.call('GET',
'http://example.com/servers/detail',
timeout=mock.ANY,
@@ -82,7 +92,7 @@ class ClientTest(utils.TestCase):
timeout=mock.ANY,
headers=reauth_headers,
allow_redirects=mock.ANY,
- data=data,
+ data=json.dumps(data),
verify=mock.ANY)]
self.assertEqual(mock_request.call_args_list, expected)