test: run cases for datetime with 2.11 fixes

There were a couple of datetime bugs in core Tarantool [1, 2] in 2.10
that were fixed in 2.11. We had a couple of test cases which were
skipped before because of these bugs. After 2.11 we may change these
skips to conditional skips.

1. tarantool/tarantool#7698
2. tarantool/tarantool#7700

Closes #246

Author: DifferentialOrange

tarantool/msgpack_ext/types/datetime.py

@@ -532,18 +532,6 @@ def __sub__(self, other):
             self_dt = self._datetime
             other_dt = other._datetime
 
-            # Tarantool datetime subtraction ignores timezone info, but it is a bug:
-            #
-            # Tarantool 2.10.1-0-g482d91c66
-            #
-            # tarantool> datetime.new{tz='MSK'} - datetime.new{tz='UTC'}
-            # ---
-            # - +0 seconds
-            # ...
-            #
-            # Refer to https://github.com/tarantool/tarantool/issues/7698
-            # for possible updates.
-
             if self_dt.tzinfo != other_dt.tzinfo:
                 other_dt = other_dt.astimezone(self_dt.tzinfo)
 

test/suites/lib/skip.py

@@ -205,6 +205,19 @@ def skip_or_run_datetime_test(func):
                                           'does not support datetime type')
 
 
+def skip_or_run_datetime_2_11_test(func):
+    """
+    Decorator to skip or run tests related to datetime module with
+    fixes introduced in 2.11 release.
+
+    See https://github.com/tarantool/tarantool/issues/7698 and
+    https://github.com/tarantool/tarantool/issues/7700
+    """
+
+    return skip_or_run_test_tarantool(func, '2.11.0',
+                                      'does not provide required datetime fixes')
+
+
 def skip_or_run_error_extra_info_test(func):
     """
     Decorator to skip or run tests related to extra error info

test/suites/test_datetime.py

@@ -15,7 +15,7 @@
 from tarantool.msgpack_ext.unpacker import ext_hook as unpacker_ext_hook
 
 from .lib.tarantool_server import TarantoolServer
-from .lib.skip import skip_or_run_datetime_test
+from .lib.skip import skip_or_run_datetime_test, skip_or_run_datetime_2_11_test
 
 
 class TestSuiteDatetime(unittest.TestCase):
@@ -381,21 +381,23 @@ def test_tarantool_datetime_subtraction(self):
     datetime_subtraction_different_timezones_case = {
         'arg_1': tarantool.Datetime(year=2001, month=2, day=3, tz='UTC'),
         'arg_2': tarantool.Datetime(year=2001, month=2, day=3, tz='MSK'),
-        'res': tarantool.Interval(day=1, hour=-21),
+        # Tarantool datetime comparison is naive, our tarantool.Interval comparison is naive too.
+        # So even though day=1, hour=-21 is the same as minute=180, test assertion fails.
+        'res_python': tarantool.Interval(day=1, hour=-21),
+        'res_tarantool': tarantool.Interval(minute=180),
     }
 
     def test_python_datetime_subtraction_different_timezones(self):
         case = self.datetime_subtraction_different_timezones_case
 
-        self.assertEqual(case['arg_1'] - case['arg_2'], case['res'])
+        self.assertEqual(case['arg_1'] - case['arg_2'], case['res_python'])
 
-    @skip_or_run_datetime_test
-    @unittest.skip('See https://github.com/tarantool/tarantool/issues/7698')
+    @skip_or_run_datetime_2_11_test
     def test_tarantool_datetime_subtraction_different_timezones(self):
         case = self.datetime_subtraction_different_timezones_case
 
         self.assertSequenceEqual(self.con.call('sub', case['arg_1'], case['arg_2']),
-                                 [case['res']])
+                                 [case['res_tarantool']])
 
     interval_arithmetic_cases = {
         'year': {
@@ -515,8 +517,7 @@ def test_python_datetime_addition_winter_time_switch(self):
 
         self.assertEqual(case['arg_1'] + case['arg_2'], case['res'])
 
-    @skip_or_run_datetime_test
-    @unittest.skip('See https://github.com/tarantool/tarantool/issues/7700')
+    @skip_or_run_datetime_2_11_test
     def test_tarantool_datetime_addition_winter_time_switch(self):
         case = self.datetime_addition_winter_time_switch_case