Merge remote-tracking branch 'origin/master' into 0.9.0_support

aviau · aviau · commit 0d178b0a8392 · 2015-02-21T14:29:35.000-05:00
diff --git a/influxdb/dataframe_client.py b/influxdb/dataframe_client.py
@@ -133,7 +133,7 @@ def _datetime_to_epoch(self, datetime, time_precision='s'):
         seconds = (datetime - self.EPOCH).total_seconds()
         if time_precision == 's':
             return seconds
-        elif time_precision == 'm':
+        elif time_precision == 'm' or time_precision == 'ms':
             return seconds * 1000
         elif time_precision == 'u':
             return seconds * 1000000
diff --git a/tests/influxdb/dataframe_client_test.py b/tests/influxdb/dataframe_client_test.py
@@ -222,3 +222,28 @@ def test_list_series(self):
             cli = DataFrameClient('host', 8086, 'username', 'password', 'db')
             series_list = cli.get_list_series()
             assert series_list == ['seriesA', 'seriesB']
+
+    def test_datetime_to_epoch(self):
+        timestamp = pd.Timestamp('2013-01-01 00:00:00.000+00:00')
+        cli = DataFrameClient('host', 8086, 'username', 'password', 'db')
+
+        self.assertEqual(
+            cli._datetime_to_epoch(timestamp),
+            1356998400.0
+        )
+        self.assertEqual(
+            cli._datetime_to_epoch(timestamp, time_precision='s'),
+            1356998400.0
+        )
+        self.assertEqual(
+            cli._datetime_to_epoch(timestamp, time_precision='m'),
+            1356998400000.0
+        )
+        self.assertEqual(
+            cli._datetime_to_epoch(timestamp, time_precision='ms'),
+            1356998400000.0
+        )
+        self.assertEqual(
+            cli._datetime_to_epoch(timestamp, time_precision='u'),
+            1356998400000000.0
+        )
