[FIX] unitests for (influxdata#649) ns precision timestamps

Author: auphofBSF

influxdb/tests/client_test.py

@@ -90,7 +90,7 @@ def setUp(self):
                     "host": "server01",
                     "region": "us-west"
                 },
-                "time": "2009-11-10T23:00:00.123456Z",
+                "time": "2009-11-10 23:10:55.123456789",
                 "fields": {
                     "value": 0.64
                 }

influxdb/tests/dataframe_client_test.py

@@ -914,36 +914,36 @@ def test_get_list_database(self):
 
     def test_datetime_to_epoch(self):
         """Test convert datetime to epoch in TestDataFrameClient object."""
-        timestamp = pd.Timestamp('2013-01-01 00:00:00.000+00:00')
+        timestamp = pd.Timestamp('2013-01-01 23:10:55.123456789+00:00')
         cli = DataFrameClient('host', 8086, 'username', 'password', 'db')
 
         self.assertEqual(
             cli._datetime_to_epoch(timestamp),
-            1356998400.0
+            1357081855
         )
         self.assertEqual(
             cli._datetime_to_epoch(timestamp, time_precision='h'),
-            1356998400.0 / 3600
+            1357081855 // 3600
         )
         self.assertEqual(
             cli._datetime_to_epoch(timestamp, time_precision='m'),
-            1356998400.0 / 60
+            1357081855 // 60
         )
         self.assertEqual(
             cli._datetime_to_epoch(timestamp, time_precision='s'),
-            1356998400.0
+            1357081855
         )
         self.assertEqual(
             cli._datetime_to_epoch(timestamp, time_precision='ms'),
-            1356998400000.0
+            1357081855123
         )
         self.assertEqual(
             cli._datetime_to_epoch(timestamp, time_precision='u'),
-            1356998400000000.0
+            1357081855123456
         )
         self.assertEqual(
             cli._datetime_to_epoch(timestamp, time_precision='n'),
-            1356998400000000000.0
+            1357081855123456789
         )
 
     def test_dsn_constructor(self):

influxdb/tests/test_line_protocol.py

@@ -48,31 +48,54 @@ def test_make_lines(self):
 
     def test_timezone(self):
         """Test timezone in TestLineProtocol object."""
+        # datetime tests
         dt = datetime(2009, 11, 10, 23, 0, 0, 123456)
         utc = UTC.localize(dt)
         berlin = timezone('Europe/Berlin').localize(dt)
         eastern = berlin.astimezone(timezone('US/Eastern'))
-        data = {
-            "points": [
+        # pandas ns timestamp tests
+        pddt = pd.Timestamp('2009-11-10 23:00:00.123456789')
+        pdutc = pd.Timestamp(pddt, tz = 'UTC')
+        pdberlin = pdutc.astimezone('Europe/Berlin')
+        pdeastern = pdberlin.astimezone('US/Eastern')
+
+        data = {  "points": [
+                {"measurement": "A", "fields": {"val": 1},
+                "time": 0},
+                #string representations
                 {"measurement": "A", "fields": {"val": 1},
-                 "time": 0},
+                "time": "2009-11-10T23:00:00.123456Z"},   # String version for datetime
                 {"measurement": "A", "fields": {"val": 1},
-                 "time": "2009-11-10T23:00:00.123456Z"},
+                "time": "2009-11-10 23:00:00.123456789"},   # String version for pandas ns timestamp
+                # datetime 
                 {"measurement": "A", "fields": {"val": 1}, "time": dt},
                 {"measurement": "A", "fields": {"val": 1}, "time": utc},
                 {"measurement": "A", "fields": {"val": 1}, "time": berlin},
                 {"measurement": "A", "fields": {"val": 1}, "time": eastern},
-            ]
-        }
+                # pandas timestamp
+                {"measurement": "A", "fields": {"val": 1}, "time": pddt},
+                {"measurement": "A", "fields": {"val": 1}, "time": pdutc},
+                {"measurement": "A", "fields": {"val": 1}, "time": pdberlin},
+                {"measurement": "A", "fields": {"val": 1}, "time": pdeastern},
+        ]}
+        
+
         self.assertEqual(
             line_protocol.make_lines(data),
             '\n'.join([
                 'A val=1i 0',
                 'A val=1i 1257894000123456000',
+                'A val=1i 1257894000123456789',
+                #datetime results
                 'A val=1i 1257894000123456000',
                 'A val=1i 1257894000123456000',
                 'A val=1i 1257890400123456000',
                 'A val=1i 1257890400123456000',
+                #pandas ns timestamp results
+                'A val=1i 1257894000123456789',
+                'A val=1i 1257894000123456789',
+                'A val=1i 1257894000123456789',
+                'A val=1i 1257894000123456789',
             ]) + '\n'
         )