Use requests_mock instead of httpretty

aviau · aviau · commit dfbc216f7192 · 2014-10-30T19:58:47.000-04:00
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,3 +1,3 @@
 nose
 mock
-httpretty
+requests-mock
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -6,7 +6,7 @@
 import requests
 import socket
 import unittest
-import httpretty
+import requests_mock
 from nose.tools import raises
 from mock import patch
 
@@ -332,29 +332,28 @@ def test_delete_database_admin(self):
     def test_get_database_user(self):
         pass
 
-    @httpretty.activate
     def test_add_database_user(self):
-        httpretty.register_uri(
-            httpretty.POST,
-            "http://localhost:8086/db/db/users"
-        )
-
-        cli = InfluxDBClient(database='db')
-        cli.add_database_user(
-            new_username='paul',
-            new_password='laup',
-            permissions=('.*', '.*')
-        )
+        with requests_mock.Mocker() as m:
+            m.register_uri(
+                requests_mock.POST,
+                "http://localhost:8086/db/db/users"
+            )
+            cli = InfluxDBClient(database='db')
+            cli.add_database_user(
+                new_username='paul',
+                new_password='laup',
+                permissions=('.*', '.*')
+            )
 
-        self.assertEqual(
-            httpretty.last_request().parsed_body,
-            {
-                u'writeTo': u'.*',
-                u'password': u'laup',
-                u'readFrom': u'.*',
-                u'name': u'paul'
-            }
-        )
+            self.assertDictEqual(
+                json.loads(m.last_request.body),
+                {
+                    'writeTo': '.*',
+                    'password': 'laup',
+                    'readFrom': '.*',
+                    'name': 'paul'
+                }
+            )
 
     def test_add_database_user_bad_permissions(self):
         cli = InfluxDBClient()

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 nose
 mock
 -httpretty
 +requests-mock