Update testcases (use 201 or 204)

smly · smly · commit 0265440d8fc5 · 2013-11-07T09:54:36.000+09:00
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -68,7 +68,7 @@ def write_points(self, data):
         if response.status_code == 200:
             return True
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
     def write_points_with_time_precision(self, data, time_precision='s'):
         """
@@ -90,7 +90,7 @@ def write_points_with_time_precision(self, data, time_precision='s'):
         if response.status_code == 200:
             return True
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
     # TODO:
     # One Time Deletes
@@ -138,7 +138,7 @@ def create_database(self, database):
         if response.status_code == 201:
             return True
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
     def delete_database(self, database):
         """
@@ -158,7 +158,7 @@ def delete_database(self, database):
         if response.status_code == 204:
             return True
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
     # Security
     # get list of cluster admins
@@ -190,7 +190,7 @@ def delete_database(self, database):
     # delete database admin
     # curl -X DELETE http://localhost:8086/db/site_dev/admins/paul?u=root&p=root
 
-    def get_list_cluster_admins(self, database):
+    def get_list_cluster_admins(self):
         """
         Get list of cluster admins
         """
@@ -203,7 +203,7 @@ def get_list_cluster_admins(self, database):
         if response.status_code == 200:
             return json.loads(response.content)
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
     def add_cluster_admin(self, new_username, new_password):
         """
@@ -222,7 +222,7 @@ def add_cluster_admin(self, new_username, new_password):
         if response.status_code == 200:
             return True
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
     def update_cluster_admin_password(self, username, new_password):
         """
@@ -241,13 +241,13 @@ def update_cluster_admin_password(self, username, new_password):
         if response.status_code == 200:
             return True
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
     def delete_cluster_admin(self, username):
         """
         Delete cluster admin
         """
-        response = requests.delete("{0}/cluster_admin/{1}?u={2}&p={3}".format(
+        response = requests.delete("{0}/cluster_admins/{1}?u={2}&p={3}".format(
             self._baseurl,
             username,
             self._username,
@@ -256,8 +256,9 @@ def delete_cluster_admin(self, username):
         if response.status_code == 204:
             return True
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
+    # TODO: Not working
     def get_list_database_admins(self):
         """
         Get list of database admins
@@ -272,8 +273,9 @@ def get_list_database_admins(self):
         if response.status_code == 200:
             return json.loads(response.content)
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
+    # TODO: Not working
     def add_database_admin(self, new_username, new_password):
         """
         Add cluster admin
@@ -292,8 +294,9 @@ def add_database_admin(self, new_username, new_password):
         if response.status_code == 200:
             return True
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
+    # TODO: Not working
     def update_database_admin_password(self, username, new_password):
         """
         Update database admin password
@@ -312,8 +315,9 @@ def update_database_admin_password(self, username, new_password):
         if response.status_code == 200:
             return True
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
+    # TODO: Not working
     def delete_database_admin(self, username):
         """
         Delete database admin
@@ -328,7 +332,7 @@ def delete_database_admin(self, username):
         if response.status_code == 204:
             return True
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
     ###
     # Limiting User Access
@@ -362,7 +366,7 @@ def get_database_users(self):
         if response.status_code == 200:
             return json.loads(response.content)
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
     def add_database_user(self, new_username, new_password):
         """
@@ -382,9 +386,9 @@ def add_database_user(self, new_username, new_password):
         if response.status_code == 200:
             return True
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
-    def update_database_password(self, username, new_password):
+    def update_database_user_password(self, username, new_password):
         """
         Update password
         """
@@ -404,7 +408,7 @@ def update_database_password(self, username, new_password):
                 self._password = new_password
             return True
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
     def delete_database_user(self, username):
         """
@@ -421,6 +425,6 @@ def delete_database_user(self, username):
         if response.status_code == 200:
             return True
         else:
-            raise Exception(response.content)
+            raise Exception("{0}: {1}".format(response.status_code, response.content))
 
     # TODO: Change read/write permission
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -27,7 +27,7 @@ def test_switch_username(self):
 
     def test_create_database(self):
         with patch.object(requests, 'post') as mocked_post:
-            mocked_post.return_value = _build_response_object()
+            mocked_post.return_value = _build_response_object(status_code=201)
             cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
             assert cli.create_database('new_db') is True
 
@@ -40,7 +40,7 @@ def test_creata_database_fails(self):
 
     def test_delete_database(self):
         with patch.object(requests, 'delete') as mocked_post:
-            mocked_post.return_value = _build_response_object()
+            mocked_post.return_value = _build_response_object(status_code=204)
             cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
             assert cli.delete_database('old_db') is True
 
