Close influxdata#30. Convert non dictionary type to json and fix the tests

prune998 · jvshahid · commit 2faf09581781 · 2014-05-21T13:23:51.000-04:00
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -71,9 +71,6 @@ def request(self, url, method='GET', params=None, data=None,
         """
         url = "{0}/{1}".format(self._baseurl, url)
 
-        if isinstance(data, dict):
-            data = json.dumps(data)
-
         if params is None:
             params = {}
 
@@ -84,6 +81,9 @@ def request(self, url, method='GET', params=None, data=None,
 
         params.update(auth)
 
+        if not isinstance(data, dict):
+            data = json.dumps(data)
+
         response = session.request(
             method=method,
             url=url,
@@ -163,7 +163,7 @@ def write_points_with_precision(self, data, time_precision='s'):
             url=url,
             method='POST',
             params=params,
-            data=json.dumps(data),
+            data=data,
             status_code=200
             )
 
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -2,6 +2,7 @@
 """
 unit tests
 """
+import json
 import requests
 from nose.tools import raises
 from mock import patch
@@ -24,7 +25,14 @@ def _mocked_session( method="GET", status_code=200, content=""):
     def check_method(*args, **kwargs):
         # Check method
         assert method == kwargs.get('method', 'GET')
-        return _build_response_object(status_code=status_code, content=content)
+        c = content
+        if method == 'POST':
+            if not isinstance(c, dict):
+                c = json.dumps(c)
+            assert c == kwargs.get('data')
+            c = ''
+
+        return _build_response_object(status_code=status_code, content=c)
 
     mocked = patch.object(
         session,
@@ -67,7 +75,7 @@ def test_write_points(self):
             }
         ]
 
-        with _mocked_session('post', 200) as mocked:
+        with _mocked_session('post', 200, data) as mocked:
             cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
             assert cli.write_points(data) is True
 
@@ -89,7 +97,7 @@ def test_write_points_with_precision(self):
             }
         ]
 
-        with _mocked_session('post', 200) as mocked:
+        with _mocked_session('post', 200, data) as mocked:
             cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
             assert cli.write_points_with_precision(data) is True
 
@@ -148,7 +156,7 @@ def test_query_fail(self):
             cli.query('select column_one from foo;')
 
     def test_create_database(self):
-        with _mocked_session('post', 201) as mocked:
+        with _mocked_session('post', 201, {"name": "new_db"}) as mocked:
             cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
             assert cli.create_database('new_db') is True
 
