tests: minor fixes

Author: gsmolk

src/restore.c

@@ -1212,7 +1212,7 @@ restore_files(void *arg)
 }
 
 /*
- * Create recovery.conf (probackup_recovery.conf in case of PG12)
+ * Create recovery.conf (postgresql.auto.conf in case of PG12)
  * with given recovery target parameters
  */
 static void

tests/archive.py

@@ -1607,7 +1607,7 @@ def test_archive_options(self):
                 ])
 
         if self.get_version(node) >= self.version_to_num('12.0'):
-            recovery_conf = os.path.join(node.data_dir, 'probackup_recovery.conf')
+            recovery_conf = os.path.join(node.data_dir, 'postgresql.auto.conf')
         else:
             recovery_conf = os.path.join(node.data_dir, 'recovery.conf')
 
@@ -1682,7 +1682,7 @@ def test_archive_options_1(self):
         self.restore_node(backup_dir, 'node', node)
 
         if self.get_version(node) >= self.version_to_num('12.0'):
-            recovery_conf = os.path.join(node.data_dir, 'probackup_recovery.conf')
+            recovery_conf = os.path.join(node.data_dir, 'postgresql.auto.conf')
         else:
             recovery_conf = os.path.join(node.data_dir, 'recovery.conf')
 
@@ -2096,7 +2096,7 @@ def test_multi_timeline_recovery_prefetching(self):
 
         if node.major_version >= 12:
             node.append_conf(
-                'probackup_recovery.conf', "restore_command = '{0}'".format(restore_command))
+                'postgresql.auto.conf', "restore_command = '{0}'".format(restore_command))
         else:
             node.append_conf(
                 'recovery.conf', "restore_command = '{0}'".format(restore_command))

tests/compatibility.py

@@ -675,7 +675,7 @@ def test_backward_compatibility_merge_1(self):
         # check that in-place is disabled
         self.assertIn(
             "WARNING: In-place merge is disabled "
-            "because of program versions mismatch", output)
+            "because of storage format incompatibility", output)
 
         # restore merged backup
         node_restored = self.make_simple_node(
@@ -1077,7 +1077,7 @@ def test_backward_compatibility_merge_5(self):
         # check that in-place is disabled
         self.assertNotIn(
             "WARNING: In-place merge is disabled "
-            "because of program versions mismatch", output)
+            "because of storage format incompatibility", output)
 
         # restore merged backup
         node_restored = self.make_simple_node(

tests/helpers/ptrack_helpers.py

@@ -1326,10 +1326,6 @@ def set_replica(
                 f.close()
 
             config = 'postgresql.auto.conf'
-            probackup_recovery_path = os.path.join(replica.data_dir, 'probackup_recovery.conf')
-            if os.path.exists(probackup_recovery_path):
-                if os.stat(probackup_recovery_path).st_size > 0:
-                    config = 'probackup_recovery.conf'
 
             if not log_shipping:
                 self.set_auto_conf(
@@ -1547,6 +1543,7 @@ def pgdata_content(self, pgdata, ignore_ptrack=True, exclude_dirs=None):
                 directory_dict['files'][file_relpath] = {'is_datafile': False}
                 with open(file_fullpath, 'rb') as f:
                     directory_dict['files'][file_relpath]['md5'] = hashlib.md5(f.read()).hexdigest()
+                    f.close()
 #                directory_dict['files'][file_relpath]['md5'] = hashlib.md5(
 #                    f = open(file_fullpath, 'rb').read()).hexdigest()