[PBCKP-259] disable tests.merge.MergeTest.test_merge_backup_from_future and tests.restore.RestoreTest.test_restore_backup_from_future as incorrect for now

Author: kulaginm

tests/merge.py

@@ -1965,7 +1965,11 @@ def test_failed_merge_after_delete_3(self):
 
         self.del_test_dir(module_name, fname)
 
-    # @unittest.skip("skip")
+    # Skipped, because backups from the future are invalid.
+    # This cause a "ERROR: Can't assign backup_id, there is already a backup in future"
+    # now (PBCKP-259). We can conduct such a test again when we
+    # untie 'backup_id' from 'start_time'
+    @unittest.skip("skip")
     def test_merge_backup_from_future(self):
         """
         take FULL backup, table PAGE backup from future,

tests/restore.py

@@ -1853,7 +1853,11 @@ def test_restore_chain_with_corrupted_backup(self):
         # Clean after yourself
         self.del_test_dir(module_name, fname)
 
-    # @unittest.skip("skip")
+    # Skipped, because backups from the future are invalid.
+    # This cause a "ERROR: Can't assign backup_id, there is already a backup in future"
+    # now (PBCKP-259). We can conduct such a test again when we
+    # untie 'backup_id' from 'start_time'
+    @unittest.skip("skip")
     def test_restore_backup_from_future(self):
         """more complex test_restore_chain()"""
         fname = self.id().split('.')[3]