update some more test cases

trehn · trehn · commit 1350d05a6c60 · 2015-06-27T01:39:19.000+02:00
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -170,12 +170,9 @@ def test_write_points(self):
             cli.write_points(
                 self.dummy_points,
             )
-            self.assertDictEqual(
-                {
-                    "database": "db",
-                    "points": self.dummy_points,
-                },
-                json.loads(m.last_request.body)
+            self.assertEqual(
+                "cpu_load_short,host=server01,region=us-west value=0.64 1257894000000000000\n",
+                m.last_request.body.decode('utf-8'),
             )
 
     def test_write_points_toplevel_attributes(self):
@@ -193,14 +190,9 @@ def test_write_points_toplevel_attributes(self):
                 tags={"tag": "hello"},
                 retention_policy="somepolicy"
             )
-            self.assertDictEqual(
-                {
-                    "database": "testdb",
-                    "tags": {"tag": "hello"},
-                    "points": self.dummy_points,
-                    "retentionPolicy": "somepolicy"
-                },
-                json.loads(m.last_request.body)
+            self.assertEqual(
+                "cpu_load_short,host=server01,region=us-west,tag=hello value=0.64 1257894000000000000\n",
+                m.last_request.body.decode('utf-8'),
             )
 
     def test_write_points_batch(self):
diff --git a/tests/influxdb/client_test_with_server.py b/tests/influxdb/client_test_with_server.py
@@ -504,9 +504,10 @@ class CommonTests(ManyTestCasesWithServerMixin,
     influxdb_template_conf = os.path.join(THIS_DIR, 'influxdb.conf.template')
 
     def test_write(self):
-        new_dummy_point = dummy_point[0].copy()
-        new_dummy_point['database'] = 'db'
-        self.assertIs(True, self.cli.write(new_dummy_point))
+        self.assertIs(True, self.cli.write(
+            {'points': dummy_point},
+            params={'db': 'db'},
+        ))
 
     @unittest.skip("fail against real server instance, "
                    "don't know if it should succeed actually..")
diff --git a/tests/influxdb/dataframe_client_test.py b/tests/influxdb/dataframe_client_test.py
@@ -31,24 +31,10 @@ def test_write_points_from_dataframe(self):
                                  index=[now, now + timedelta(hours=1)],
                                  columns=["column_one", "column_two",
                                           "column_three"])
-        expected = {
-            'database': 'db',
-            'points': [
-                {'time': '1970-01-01T00:00:00+00:00',
-                 'fields': {
-                     'column_two': 1,
-                     'column_three': 1.0,
-                     'column_one': '1'},
-                 'tags': {},
-                 'measurement': 'foo'},
-                {'time': '1970-01-01T01:00:00+00:00',
-                 'fields': {
-                     'column_two': 2,
-                     'column_three': 2.0,
-                     'column_one': '2'},
-                 'tags': {},
-                 'measurement': 'foo'}]
-        }
+        expected = (
+            b"foo column_one=\"1\",column_three=1.0,column_two=1 0\n"
+            b"foo column_one=\"2\",column_three=2.0,column_two=2 3600000000000\n"
+        )
 
         with requests_mock.Mocker() as m:
             m.register_uri(requests_mock.POST,
@@ -58,10 +44,10 @@ def test_write_points_from_dataframe(self):
             cli = DataFrameClient(database='db')
 
             cli.write_points(dataframe, 'foo')
-            self.assertEqual(json.loads(m.last_request.body), expected)
+            self.assertEqual(m.last_request.body, expected)
 
             cli.write_points(dataframe, 'foo', tags=None)
-            self.assertEqual(json.loads(m.last_request.body), expected)
+            self.assertEqual(m.last_request.body, expected)
 
     def test_write_points_from_dataframe_in_batches(self):
         now = pd.Timestamp('1970-01-01 00:00+00:00')
@@ -83,24 +69,10 @@ def test_write_points_from_dataframe_with_numeric_column_names(self):
         dataframe = pd.DataFrame(data=[["1", 1, 1.0], ["2", 2, 2.0]],
                                  index=[now, now + timedelta(hours=1)])
 
-        expected = {
-            'database': 'db',
-            'points': [
-                {'fields': {
-                    '0': '1',
-                    '1': 1,
-                    '2': 1.0},
-                 'tags': {'hello': 'there'},
-                 'time': '1970-01-01T00:00:00+00:00',
-                 'measurement': 'foo'},
-                {'fields': {
-                    '0': '2',
-                    '1': 2,
-                    '2': 2.0},
-                 'tags': {'hello': 'there'},
-                 'time': '1970-01-01T01:00:00+00:00',
-                 'measurement': 'foo'}],
-        }
+        expected = (
+            b"foo,hello=there 0=\"1\",1=1,2=1.0 0\n"
+            b"foo,hello=there 0=\"2\",1=2,2=2.0 3600000000000\n"
+        )
 
         with requests_mock.Mocker() as m:
             m.register_uri(requests_mock.POST,
@@ -110,32 +82,18 @@ def test_write_points_from_dataframe_with_numeric_column_names(self):
             cli = DataFrameClient(database='db')
             cli.write_points(dataframe, "foo", {"hello": "there"})
 
-            self.assertEqual(json.loads(m.last_request.body), expected)
+            self.assertEqual(m.last_request.body, expected)
 
     def test_write_points_from_dataframe_with_period_index(self):
         dataframe = pd.DataFrame(data=[["1", 1, 1.0], ["2", 2, 2.0]],
                                  index=[pd.Period('1970-01-01'),
                                         pd.Period('1970-01-02')],
                                  columns=["column_one", "column_two",
                                           "column_three"])
-        expected = {
-            'points': [
-                {'measurement': 'foo',
-                 'tags': {},
-                 'fields': {
-                     'column_one': '1',
-                     'column_two': 1,
-                     'column_three': 1.0},
-                 'time': '1970-01-01T00:00:00+00:00'},
-                {'measurement': 'foo',
-                 'tags': {},
-                 'fields': {
-                     'column_one': '2',
-                     'column_two': 2,
-                     'column_three': 2.0},
-                 'time': '1970-01-02T00:00:00+00:00'}],
-            'database': 'db',
-        }
+        expected = (
+            b"foo column_one=\"1\",column_three=1.0,column_two=1 0\n"
+            b"foo column_one=\"2\",column_three=2.0,column_two=2 86400000000000\n"
+        )
 
         with requests_mock.Mocker() as m:
             m.register_uri(requests_mock.POST,
@@ -145,7 +103,7 @@ def test_write_points_from_dataframe_with_period_index(self):
             cli = DataFrameClient(database='db')
             cli.write_points(dataframe, "foo")
 
-            self.assertEqual(json.loads(m.last_request.body), expected)
+            self.assertEqual(m.last_request.body, expected)
 
     def test_write_points_from_dataframe_with_time_precision(self):
         now = pd.Timestamp('1970-01-01 00:00+00:00')
