Fixed tests for new line protocol

aviau · aviau · commit a17e743c0823 · 2015-07-03T12:05:53.000-04:00
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -207,13 +207,11 @@ def test_write_points_batch(self):
             {"measurement": "network", "tags": {"direction": "out"},
              "time": "2009-11-10T23:00:00Z", "fields": {"value": 12.00}}
         ]
-        expected_last_body = {"tags": {"host": "server01",
-                                       "region": "us-west"},
-                              "database": "db",
-                              "points": [{"measurement": "network",
-                                          "tags": {"direction": "out"},
-                                          "time": "2009-11-10T23:00:00Z",
-                                          "fields": {"value": 12.00}}]}
+        expected_last_body = (
+            "network,direction=out,host=server01,region=us-west "
+            "value=12.0 1257894000000000000\n"
+        )
+
         with requests_mock.Mocker() as m:
             m.register_uri(requests_mock.POST,
                            "http://localhost:8086/write",
@@ -225,7 +223,7 @@ def test_write_points_batch(self):
                                    "region": "us-west"},
                              batch_size=2)
         self.assertEqual(m.call_count, 2)
-        self.assertEqual(expected_last_body, m.last_request.json())
+        self.assertEqual(expected_last_body, m.last_request.body)
 
     def test_write_points_udp(self):
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
@@ -240,12 +238,10 @@ def test_write_points_udp(self):
 
         received_data, addr = s.recvfrom(1024)
 
-        self.assertDictEqual(
-            {
-                "points": self.dummy_points,
-                "database": "test"
-            },
-            json.loads(received_data.decode(), strict=True)
+        self.assertEqual(
+            "cpu_load_short,host=server01,region=us-west "
+            "value=0.64 1257894000000000000\n",
+            received_data.decode()
         )
 
     def test_write_bad_precision_udp(self):
diff --git a/tests/influxdb/dataframe_client_test.py b/tests/influxdb/dataframe_client_test.py
@@ -142,16 +142,15 @@ def test_write_points_from_dataframe_with_time_precision(self):
             measurement = "foo"
 
             cli.write_points(dataframe, measurement, time_precision='s')
-            points.update(precision='s')
-            self.assertEqual(json.loads(m.last_request.body), points)
+            self.assertEqual(m.last_request.qs['precision'], ['s'])
 
             cli.write_points(dataframe, measurement, time_precision='m')
             points.update(precision='m')
-            self.assertEqual(json.loads(m.last_request.body), points)
+            self.assertEqual(m.last_request.qs['precision'], ['m'])
 
             cli.write_points(dataframe, measurement, time_precision='u')
             points.update(precision='u')
-            self.assertEqual(json.loads(m.last_request.body), points)
+            self.assertEqual(m.last_request.qs['precision'], ['u'])
 
     @raises(TypeError)
     def test_write_points_from_dataframe_fails_without_time_index(self):
