Fix tests

Author: Tattoo

src/oxygen/robot3_interface.py

@@ -288,8 +288,6 @@ def ms_to_timestamp(self, milliseconds):
         tz_delta = self.get_timezone_delta()
 
         time_object = datetime.fromtimestamp(int(milliseconds / 1000)) - tz_delta
-        milliseconds_delta = timedelta(milliseconds=(milliseconds % 1000))
-        time_object = (time_object + milliseconds_delta)
         if time_object.year < 1970:
             time_object = datetime.fromtimestamp(0)
         # fromtimestamp() loses milliseconds, add them back

src/oxygen/robot4_interface.py

@@ -5,8 +5,6 @@
                                 TestCase as RobotResultTest,
                                 TestSuite as RobotResultSuite)
 
-from robot.model import BodyItem
-
 from robot.running.model import TestSuite as RobotRunningSuite
 
 
@@ -227,6 +225,8 @@ def spawn_robot_keyword(self,
         start_timestamp = self.ms_to_timestamp(start_time)
         end_timestamp = self.ms_to_timestamp(end_time)
 
+        # import this here so RF4 interface stays in parity with RF3
+        from robot.model import BodyItem
         if setup:
             keyword_type = BodyItem.SETUP
         elif teardown:
@@ -284,7 +284,6 @@ def timestamp_to_ms(self, timestamp):
 
         return milliseconds
 
-
     def ms_to_timestamp(self, milliseconds):
         tz_delta = self.get_timezone_delta()
 

tests/utest/robot_interface/test_time_conversions.py

@@ -9,29 +9,35 @@ def setUp(self):
 
     def test_should_be_correct(self):
         timestamp = self.interface.result.ms_to_timestamp(1533625284100.0)
-        assert timestamp == '20180807 07:01:24.100000'
+        self.assertEqual(timestamp, '20180807 07:01:24.100000')
 
         timestamp = self.interface.result.ms_to_timestamp(1533625284451.0)
-        assert timestamp == '20180807 07:01:24.451000'
+        self.assertEqual(timestamp, '20180807 07:01:24.451000')
 
     def test_should_be_associative(self):
         timestamp = '20180807 07:01:24.300000'
 
         milliseconds = self.interface.result.timestamp_to_ms(timestamp)
-        assert milliseconds == 1533625284300.0
+        self.assertEqual(milliseconds, 1533625284300.0)
 
         timestamp = self.interface.result.ms_to_timestamp(milliseconds)
-        assert timestamp == '20180807 07:01:24.300000'
+        self.assertEqual(timestamp, '20180807 07:01:24.300000')
 
         milliseconds = self.interface.result.timestamp_to_ms(timestamp)
-        assert milliseconds == 1533625284300.0
+        self.assertEqual(milliseconds, 1533625284300.0)
 
         timestamp = self.interface.result.ms_to_timestamp(milliseconds)
-        assert timestamp == '20180807 07:01:24.300000'
+        self.assertEqual(timestamp, '20180807 07:01:24.300000')
 
     def _validate_timestamp(self, result):
         timestamp = result.ms_to_timestamp(-10)
-        self.assertEqual(timestamp, '19700101 02:00:00.990000')
+        expected = '19700101 00:00:00.990000'
+        # Windows 10 calculates epoch differently ( T ʖ̯ T)
+        import platform
+        if platform.system() == 'Windows' and platform.release() == '10':
+            expected = '19700101 02:00:00.990000'
+
+        self.assertEqual(timestamp, expected)
 
     def test_ms_before_epoch_are_reset_to_epoch(self):
         from oxygen.robot4_interface import RobotResultInterface as RF4ResultIface
@@ -47,19 +53,19 @@ def setUp(self):
 
     def test_should_be_correct(self):
         milliseconds = self.iface.result.timestamp_to_ms('20180807 07:01:24.000')
-        assert milliseconds == 1533625284000.0
+        self.assertEqual(milliseconds, 1533625284000.0)
 
         milliseconds = self.iface.result.timestamp_to_ms('20180807 07:01:24.555')
-        assert milliseconds == 1533625284555.0
+        self.assertEqual(milliseconds, 1533625284555.0)
 
     def test_should_be_associative(self):
         milliseconds = 1533625284300.0
 
         timestamp = self.iface.result.ms_to_timestamp(milliseconds)
-        assert timestamp == '20180807 07:01:24.300000'
+        self.assertEqual(timestamp, '20180807 07:01:24.300000')
 
         milliseconds = self.iface.result.timestamp_to_ms(timestamp)
-        assert milliseconds == 1533625284300.0
+        self.assertEqual(milliseconds, 1533625284300.0)
 
         timestamp = self.iface.result.ms_to_timestamp(milliseconds)
-        assert timestamp == '20180807 07:01:24.300000'
+        self.assertEqual(timestamp, '20180807 07:01:24.300000')