Merge branch 'master' of github.com:jjmalina/influxdb-python

jvshahid · jvshahid · commit 5840981439b7 · 2014-03-03T13:14:03.000-05:00
Conflicts:
	influxdb/client.py
	tests/influxdb/client_test.py
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -262,6 +262,28 @@ def get_database_list(self):
             raise Exception(
                 "{0}: {1}".format(response.status_code, response.content))
 
+    def delete_series(self, series):
+        """
+        Drop a series
+
+        Parameters
+        ----------
+        series: string
+            series name
+        """
+        response = session.delete("{0}/db/{1}/series/{2}?u={3}&p={4}".format(
+            self._baseurl,
+            self._database,
+            series,
+            self._username,
+            self._password))
+
+        if response.status_code == 204:
+            return True
+        else:
+            raise Exception(
+                "{0}: {1}".format(response.status_code, response.content))
+
     # Security
     # get list of cluster admins
     # curl http://localhost:8086/cluster_admins?u=root&p=root
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -158,6 +158,19 @@ def test_get_database_list_fails(self):
             cli = InfluxDBClient('host', 8086, 'username', 'password')
             cli.get_database_list()
 
+    def test_delete_series(self):
+        with patch.object(session, 'delete') as mocked_delete:
+            mocked_delete.return_value = _build_response_object(status_code=204)
+            cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
+            cli.delete_series('old_series')
+
+    @raises(Exception)
+    def test_delete_series_fails(self):
+        with patch.object(session, 'delete') as mocked_delete:
+            mocked_delete.return_value = _build_response_object(status_code=401)
+            cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
+            cli.delete_series('old_series')
+
     def test_get_list_cluster_admins(self):
         pass
 
