Merge pull request influxdata#31 from william-p/request_payload

jvshahid · jvshahid · commit 5767c532b2b4 · 2014-05-22T12:48:17.000-04:00
In all cases, serialise Data if not a string
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -81,7 +81,7 @@ def request(self, url, method='GET', params=None, data=None,
 
         params.update(auth)
 
-        if not isinstance(data, dict):
+        if data is not None and not isinstance(data, str):
             data = json.dumps(data)
 
         response = session.request(
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -18,26 +18,38 @@ def _build_response_object(status_code=200, content=""):
     return resp
 
 
-def _mocked_session( method="GET", status_code=200, content=""):
+def _mocked_session(method="GET", status_code=200, content=""):
 
     method = method.upper()
 
-    def check_method(*args, **kwargs):
+    def request(*args, **kwargs):
+        c = content
+
         # Check method
         assert method == kwargs.get('method', 'GET')
-        c = content
+
         if method == 'POST':
-            if not isinstance(c, dict):
-                c = json.dumps(c)
-            assert c == kwargs.get('data')
-            c = ''
+            data = kwargs.get('data', None)
+
+            if data is not None:
+                # Data must be a string
+                assert isinstance(data, str)
+
+                # Data must be a JSON string
+                assert c == json.loads(data)
+
+                c = data
+
+        # Anyway, Content must be a JSON string (or empty string)
+        if not isinstance(c, str):
+            c =  json.dumps(c)
 
         return _build_response_object(status_code=status_code, content=c)
 
     mocked = patch.object(
         session,
         'request',
-        side_effect = check_method
+        side_effect = request
         )
 
     return mocked
@@ -140,11 +152,16 @@ def test_remove_scheduled_delete(self):
         cli.remove_scheduled_delete(1)
 
     def test_query(self):
-        expected = ('[{"name":"foo",'
-                    '"columns":["time","sequence_number","column_one"],'
-                    '"points":[[1383876043,16,"2"],[1383876043,15,"1"],'
-                    '[1383876035,14,"2"],[1383876035,13,"1"]]}]')
-        with _mocked_session('get', 200, expected) as mocked:
+        data = [
+            {   "name":"foo",
+                "columns": ["time", "sequence_number", "column_one"],
+                "points": [
+                    [1383876043, 16, "2"], [1383876043, 15, "1"],
+                    [1383876035, 14, "2"], [1383876035, 13, "1"]
+                ]
+            }
+        ]
+        with _mocked_session('get', 200, data) as mocked:
             cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
             result = cli.query('select column_one from foo;')
             assert len(result[0]['points']) == 4
@@ -161,7 +178,7 @@ def test_create_database(self):
             assert cli.create_database('new_db') is True
 
     @raises(Exception)
-    def test_creata_database_fails(self):
+    def test_create_database_fails(self):
         with _mocked_session('post', 401) as mocked:
             cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
             cli.create_database('new_db')
@@ -178,8 +195,10 @@ def test_delete_database_fails(self):
             cli.delete_database('old_db')
 
     def test_get_database_list(self):
-        expected = ('[{"name": "a_db"}]')
-        with _mocked_session('get', 200, expected) as mocked:
+        data = [
+            {"name": "a_db"}
+        ]
+        with _mocked_session('get', 200, data) as mocked:
             cli = InfluxDBClient('host', 8086, 'username', 'password')
             assert len(cli.get_database_list()) == 1
             assert cli.get_database_list()[0]['name'] == 'a_db'
