Fixed list series

timtroendle · timtroendle · commit aa0803f90db5 · 2014-11-22T20:37:20.000+01:00
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -293,9 +293,6 @@ def remove_scheduled_delete(self, delete_id):
         """
         raise NotImplementedError()
 
-    # Querying Data
-    #
-    # GET db/:name/series. It takes five parameters
     def query(self, query, time_precision='s', chunked=False):
         """
         Quering data
@@ -305,6 +302,13 @@ def query(self, query, time_precision='s', chunked=False):
         :param chunked: [Optional, default=False] True if the data shall be
             retrieved in chunks, False otherwise.
         """
+        return self._query(query, time_precision=time_precision,
+                           chunked=chunked)
+
+    # Querying Data
+    #
+    # GET db/:name/series. It takes five parameters
+    def _query(self, query, time_precision='s', chunked=False):
         if time_precision not in ['s', 'm', 'ms', 'u']:
             raise Exception(
                 "Invalid time precision is given. (use 's', 'm', 'ms' or 'u')")
@@ -431,7 +435,7 @@ def get_list_series(self):
         Get a list of all time series in a database
         """
 
-        response = self.query('list series')
+        response = self._query('list series')
 
         series_list = []
         for series in response[0]['points']:
@@ -444,7 +448,7 @@ def get_list_continuous_queries(self):
         Get a list of continuous queries
         """
 
-        response = self.query('list continuous queries')
+        response = self._query('list continuous queries')
         queries_list = []
         for query in response[0]['points']:
             queries_list.append(query[2])
diff --git a/tests/influxdb/misc_test.py b/tests/influxdb/misc_test.py
@@ -143,3 +143,16 @@ def test_query_into_dataframe(self):
             cli = DataFrameClient('host', 8086, 'username', 'password', 'db')
             result = cli.query('select column_one from foo;')
             assert_frame_equal(dataframe, result)
+
+    def test_list_series(self):
+        response = [
+            {
+                'columns': ['time', 'name'],
+                'name': 'list_series_result',
+                'points': [[0, 'seriesA'], [0, 'seriesB']]
+            }
+        ]
+        with _mocked_session('get', 200, response):
+            cli = DataFrameClient('host', 8086, 'username', 'password', 'db')
+            series_list = cli.get_list_series()
+            assert series_list == ['seriesA', 'seriesB']
