Add additional tests for SeriesHelper time field

matt-snider · matt-snider · commit 309d295afee3 · 2016-04-10T16:05:53.000+02:00
diff --git a/influxdb/tests/helper_test.py b/influxdb/tests/helper_test.py
@@ -8,7 +8,7 @@
 import warnings
 
 import mock
-from datetime import datetime
+from datetime import datetime, timedelta
 from unittest.mock import patch
 from influxdb import SeriesHelper, InfluxDBClient
 from requests.exceptions import ConnectionError
@@ -209,6 +209,64 @@ def testSeveralSeriesNames(self, current_timestamp):
             [],
             'Resetting helper did not empty datapoints.')
 
+    @patch('influxdb.helper.SeriesHelper._current_timestamp')
+    def testSeriesWithoutTimeField(self, current_timestamp):
+        """
+        Tests that time is optional on a series without a time field.
+        """
+        current_date = datetime.today()
+        yesterday = current_date - timedelta(days=1)
+        current_timestamp.return_value = yesterday
+        TestSeriesHelper.MySeriesHelper(
+            server_name='us.east-1', other_tag='ello',
+            some_stat=159, time=current_date
+        )
+        TestSeriesHelper.MySeriesHelper(
+            server_name='us.east-1', other_tag='ello',
+            some_stat=158,
+        )
+        point1, point2 = TestSeriesHelper.MySeriesHelper._json_body_()
+        self.assertTrue('time' in point1 and 'time' in point2)
+        self.assertEqual(point1['time'], current_date)
+        self.assertEqual(point2['time'], yesterday)
+        TestSeriesHelper.MySeriesHelper._reset_()
+        self.assertEqual(
+            TestSeriesHelper.MySeriesHelper._json_body_(),
+            [],
+            'Resetting helper did not empty datapoints.')
+
+    @patch('influxdb.helper.SeriesHelper._current_timestamp')
+    def testSeriesWithTimeField(self, current_timestamp):
+        """
+        Test that time is optional on a series with a time field.
+        """
+        current_date = datetime.today()
+        yesterday = current_date - timedelta(days=1)
+        current_timestamp.return_value = yesterday
+
+        class MyTimeFieldSeriesHelper(SeriesHelper):
+
+            class Meta:
+                client = TestSeriesHelper.client
+                series_name = 'events.stats.{server_name}'
+                fields = ['some_stat', 'time']
+                tags = ['server_name', 'other_tag']
+                bulk_size = 5
+                autocommit = True
+
+        MyTimeFieldSeriesHelper(
+            server_name='us.east-1', other_tag='ello',
+            some_stat=159, time=current_date
+        )
+        MyTimeFieldSeriesHelper(
+            server_name='us.east-1', other_tag='ello',
+            some_stat=158,
+        )
+        point1, point2 = MyTimeFieldSeriesHelper._json_body_()
+        self.assertTrue('time' in point1 and 'time' in point2)
+        self.assertEqual(point1['time'], current_date)
+        self.assertEqual(point2['time'], yesterday)
+
     def testInvalidHelpers(self):
         '''
         Tests errors in invalid helpers.
