Added tests for influxdata#78 + fixed related issues

aviau · aviau · commit 4f2bb5e56f4f · 2014-11-05T10:13:49.000-05:00
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -324,8 +324,6 @@ def query(self, query, time_precision='s', chunked=False):
 
         return response.json()
 
-
-
     # Creating and Dropping Databases
     #
     # ### create a database
@@ -417,55 +415,30 @@ def delete_series(self, series):
 
         return True
 
-    def get_series_list(self):
+    def get_list_series(self):
         """
-        Querying all time series in a database
+        Get a list of all time series in a database
         """
 
-        url = "db/{0}/series".format(self._database)
+        response = self.query('list series')
 
-        params = {
-            'q': 'list series'
-            'time_precision': 's',
-            'chunked': 'false'
-        }
-
-        response = self.request(
-            url=url,
-            method='GET',
-            params=params,
-            status_code=200
-        )
         series_list = []
-        for series in response.json()[0]['points']:
+        for series in response[0]['points']:
             series_list.append(series[1])
 
         return series_list
 
-    def get_continuous_list(self):
+    def get_list_continuous_queries(self):
         """
-        Querying all time series in a database
+        Get a list of continuous queries
         """
 
-        url = "db/{0}/series".format(self._database)
-
-        params = {
-            'q': 'list continuous queries'
-            'time_precision': 's',
-            'chunked': 'false'
-        }
+        response = self.query('list continuous queries')
+        queries_list = []
+        for query in response[0]['points']:
+            queries_list.append(query[2])
 
-        response = self.request(
-            url=url,
-            method='GET',
-            params=params,
-            status_code=200
-        )
-        series_list = []
-        for series in response.json()[0]['points']:
-            series_list.append(series[1])
-
-        return series_list
+        return queries_list
 
     # Security
     # get list of cluster admins
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -285,6 +285,57 @@ def test_delete_series_fails(self):
             cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
             cli.delete_series('old_series')
 
+    def test_get_series_list(self):
+        cli = InfluxDBClient(database='db')
+
+        with requests_mock.Mocker() as m:
+            example_response = \
+                '[{"name":"list_series_result","columns":' \
+                '["time","name"],"points":[[0,"foo"],[0,"bar"]]}]'
+
+            m.register_uri(
+                requests_mock.GET,
+                "http://localhost:8086/db/db/series",
+                text=example_response
+            )
+
+            self.assertListEqual(
+                cli.get_list_series(),
+                ['foo', 'bar']
+            )
+
+    def test_get_continuous_queries(self):
+        cli = InfluxDBClient(database='db')
+
+        with requests_mock.Mocker() as m:
+
+            # Tip: put this in a json linter!
+            example_response = '[ { "name": "continuous queries", "columns"' \
+                               ': [ "time", "id", "query" ], "points": [ [ ' \
+                               '0, 1, "select foo(bar,95) from \\"foo_bar' \
+                               's\\" group by time(5m) into response_times.' \
+                               'percentiles.5m.95" ], [ 0, 2, "select perce' \
+                               'ntile(value,95) from \\"response_times\\" g' \
+                               'roup by time(5m) into response_times.percen' \
+                               'tiles.5m.95" ] ] } ]'
+
+            m.register_uri(
+                requests_mock.GET,
+                "http://localhost:8086/db/db/series",
+                text=example_response
+            )
+
+            self.assertListEqual(
+                cli.get_list_continuous_queries(),
+                [
+                    'select foo(bar,95) from "foo_bars" group '
+                    'by time(5m) into response_times.percentiles.5m.95',
+
+                    'select percentile(value,95) from "response_times" group '
+                    'by time(5m) into response_times.percentiles.5m.95'
+                ]
+            )
+
     def test_get_list_cluster_admins(self):
         pass
 
