tests: minor fixes

Author: gsmolk

tests/backup.py

@@ -2019,6 +2019,7 @@ def test_backup_with_less_privileges_role(self):
         self.set_replica(node, replica)
         self.add_instance(backup_dir, 'replica', replica)
         self.set_archiving(backup_dir, 'replica', replica, replica=True)
+        self.set_auto_conf(replica, {'hot_standby': 'on'})
 
         # freeze bgwriter to get rid of RUNNING XACTS records
         bgwriter_pid = node.auxiliary_pids[ProcessType.BackgroundWriter][0]
@@ -2036,13 +2037,13 @@ def test_backup_with_less_privileges_role(self):
         # FULL backup from replica
         self.backup_node(
             backup_dir, 'replica', replica,
-            datname='backupdb', options=['--stream', '-U', 'backup'])
+            datname='backupdb', options=['--stream', '-U', 'backup', '--archive-timeout=30s'])
 
-        self.switch_wal_segment(node)
+#        self.switch_wal_segment(node)
 
         self.backup_node(
             backup_dir, 'replica', replica, datname='backupdb',
-            options=['-U', 'backup', '--log-level-file=verbose', '--archive-timeout=30s'])
+            options=['-U', 'backup', '--archive-timeout=300s'])
 
         # PAGE backup from replica
         self.backup_node(

tests/merge.py

@@ -1051,6 +1051,8 @@ def test_continue_failed_merge(self):
         gdb.continue_execution_until_break(5)
 
         gdb._execute('signal SIGKILL')
+        gdb._execute('detach')
+        time.sleep(1)
 
         print(self.show_pb(backup_dir, as_text=True, as_json=False))
 

tests/replica.py

@@ -402,7 +402,13 @@ def test_take_backup_from_delayed_replica(self):
 
         self.wait_until_replica_catch_with_master(master, replica)
 
-        self.set_auto_conf(replica, {'recovery_min_apply_delay': '300s'})
+        if self.get_version(master) >= self.version_to_num('12.0'):
+            self.set_auto_conf(
+                replica, {'recovery_min_apply_delay': '300s'})
+        else:
+            replica.append_conf(
+                'postgresql.auto.conf',
+                'recovery_min_apply_delay = 300s')
 
         replica.stop()
         replica.slow_start(replica=True)

tests/time_stamp.py

@@ -60,7 +60,7 @@ def test_server_date_style(self):
             base_dir="{0}/{1}/node".format(module_name, fname),
             set_replication=True,
             initdb_params=['--data-checksums'],
-            pg_options={"datestyle": "'GERMAN, DMY'"})
+            pg_options={"datestyle": "GERMAN, DMY"})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)