[Issue #146] tests update

Author: gsmolk

tests/backup.py

@@ -2726,7 +2726,7 @@ def test_note_sanity(self):
         node.slow_start()
 
         # FULL backup
-        self.backup_node(
+        backup_id = self.backup_node(
             backup_dir, 'node', node,
             options=['--stream', '--log-level-file=LOG', '--note=test_note'])
 
@@ -2736,5 +2736,13 @@ def test_note_sanity(self):
 
         self.assertEqual(show_backups[0]['note'], "test_note")
 
+        self.set_backup(backup_dir, 'node', backup_id, options=['--note=none'])
+
+        backup_meta = self.show_pb(backup_dir, 'node', backup_id)
+
+        self.assertNotIn(
+            'note',
+            backup_meta)
+
         # Clean after yourself
         self.del_test_dir(module_name, fname)

tests/merge.py

@@ -22,8 +22,7 @@ def test_basic_merge_full_page(self):
         # Initialize instance and backup directory
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
-            initdb_params=["--data-checksums"]
-        )
+            initdb_params=["--data-checksums"])
 
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, "node", node)
@@ -1981,8 +1980,7 @@ def test_merge_backup_from_future(self):
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True,
             initdb_params=['--data-checksums'],
-            pg_options={
-                'autovacuum': 'off'})
+            pg_options={'autovacuum': 'off'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)
@@ -2384,5 +2382,60 @@ def test_idempotent_merge(self):
 
         self.del_test_dir(module_name, fname)
 
+    def test_merge_correct_inheritance(self):
+        """
+        Make sure that backup metainformation fields
+        'note' and 'expire-time' are correctly inherited
+        during merge
+        """
+        fname = self.id().split('.')[3]
+        backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
+        node = self.make_simple_node(
+            base_dir=os.path.join(module_name, fname, 'node'),
+            set_replication=True,
+            initdb_params=['--data-checksums'],
+            pg_options={'autovacuum': 'off'})
+
+        self.init_pb(backup_dir)
+        self.add_instance(backup_dir, 'node', node)
+        self.set_archiving(backup_dir, 'node', node)
+        node.slow_start()
+
+        # add database
+        node.safe_psql(
+            'postgres',
+            'CREATE DATABASE testdb')
+
+        # take FULL backup
+        self.backup_node(backup_dir, 'node', node, options=['--stream'])
+
+        # create database
+        node.safe_psql(
+            'postgres',
+            'create DATABASE testdb1')
+
+        # take PAGE backup
+        page_id = self.backup_node(
+            backup_dir, 'node', node, backup_type='page')
+
+        self.set_backup(
+            backup_dir, 'node', page_id, options=['--note=hello', '--ttl=20d'])
+
+        page_meta = self.show_pb(backup_dir, 'node', page_id)
+
+        self.merge_backup(backup_dir, 'node', page_id)
+
+        print(self.show_pb(backup_dir, 'node', page_id))
+
+        self.assertEqual(
+            page_meta['note'],
+            self.show_pb(backup_dir, 'node', page_id)['note'])
+
+        self.assertEqual(
+            page_meta['expire-time'],
+            self.show_pb(backup_dir, 'node', page_id)['expire-time'])
+
+        self.del_test_dir(module_name, fname)
+
 # 1. Need new test with corrupted FULL backup
 # 2. different compression levels