tests: minor changes for 9.5

Author: gsmolk

tests/archive.py

@@ -640,7 +640,7 @@ def test_master_and_replica_concurrent_archiving(self):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'wal_level': 'replica',
+                'wal_level': 'logical',
                 'max_wal_senders': '2',
                 'checkpoint_timeout': '30s'}
             )
@@ -668,7 +668,9 @@ def test_master_and_replica_concurrent_archiving(self):
         pgdata_master = self.pgdata_content(master.data_dir)
 
         # Settings for Replica
-        self.restore_node(backup_dir, 'master', replica)
+        self.restore_node(
+            backup_dir, 'master', replica,
+            options=['--recovery-target-action=promote'])
         # CHECK PHYSICAL CORRECTNESS on REPLICA
         pgdata_replica = self.pgdata_content(replica.data_dir)
         self.compare_pgdata(pgdata_master, pgdata_replica)
@@ -723,7 +725,7 @@ def test_archive_pg_receivexlog(self):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'wal_level': 'replica',
+                'wal_level': 'logical',
                 'max_wal_senders': '2',
                 'checkpoint_timeout': '30s'}
             )

tests/helpers/ptrack_helpers.py

@@ -208,11 +208,12 @@ def make_simple_node(
         node.init(
            initdb_params=initdb_params, allow_streaming=set_replication)
 
-        # Sane default parameters, not a shit with fsync = off from testgres
+        # Sane default parameters
         node.append_conf("postgresql.auto.conf", "max_connections = 100")
         node.append_conf("postgresql.auto.conf", "shared_buffers = 10MB")
         node.append_conf("postgresql.auto.conf", "fsync = on")
         node.append_conf("postgresql.auto.conf", "wal_level = minimal")
+        node.append_conf("postgresql.auto.conf", "hot_standby = 'off'")
 
         node.append_conf(
             "postgresql.auto.conf", "log_line_prefix = '%t [%p]: [%l-1] '")
@@ -742,10 +743,10 @@ def set_archiving(
         else:
             archive_mode = 'on'
 
-        node.append_conf(
-            "postgresql.auto.conf",
-            "wal_level = archive"
-        )
+        # node.append_conf(
+        #     "postgresql.auto.conf",
+        #     "wal_level = archive"
+        # )
         node.append_conf(
                 "postgresql.auto.conf",
                 "archive_mode = {0}".format(archive_mode)

tests/option_test.py

@@ -50,12 +50,8 @@ def test_options_4(self):
         """check options test"""
         fname = self.id().split(".")[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
-        node = self.make_simple_node(base_dir="{0}/{1}/node".format(module_name, fname),
-            pg_options={'wal_level': 'replica', 'max_wal_senders': '2'})
-        try:
-            node.stop()
-        except:
-            pass
+        node = self.make_simple_node(
+            base_dir="{0}/{1}/node".format(module_name, fname))
 
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'node', node)
@@ -113,15 +109,18 @@ def test_options_4(self):
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(repr(e.message), self.cmd))
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        # self.del_test_dir(module_name, fname)
 
-    #@unittest.skip("skip")
+    # @unittest.skip("skip")
     def test_options_5(self):
         """check options test"""
         fname = self.id().split(".")[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
-        node = self.make_simple_node(base_dir="{0}/{1}/node".format(module_name, fname),
-            pg_options={'wal_level': 'replica', 'max_wal_senders': '2'})
+        node = self.make_simple_node(
+            base_dir="{0}/{1}/node".format(module_name, fname),
+            pg_options={
+                'wal_level': 'logical',
+                'max_wal_senders': '2'})
 
         self.assertEqual("INFO: Backup catalog '{0}' successfully inited\n".format(backup_dir),
             self.init_pb(backup_dir))

tests/page.py

@@ -133,8 +133,7 @@ def test_page_stream(self):
             pg_options={
                 'wal_level': 'replica',
                 'max_wal_senders': '2',
-                'checkpoint_timeout': '30s',
-                'ptrack_enable': 'on'}
+                'checkpoint_timeout': '30s'}
             )
 
         self.init_pb(backup_dir)
@@ -213,8 +212,7 @@ def test_page_archive(self):
             pg_options={
                 'wal_level': 'replica',
                 'max_wal_senders': '2',
-                'checkpoint_timeout': '30s',
-                'ptrack_enable': 'on'}
+                'checkpoint_timeout': '30s'}
             )
 
         self.init_pb(backup_dir)
@@ -250,7 +248,10 @@ def test_page_archive(self):
             self.restore_node(
                 backup_dir, 'node', node,
                 backup_id=full_backup_id,
-                options=["-j", "4"]),
+                options=[
+                    "-j", "4",
+                    "--immediate",
+                    "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
         node.start()
@@ -264,7 +265,10 @@ def test_page_archive(self):
             self.restore_node(
                 backup_dir, 'node', node,
                 backup_id=page_backup_id,
-                options=["-j", "4"]),
+                options=[
+                    "-j", "4",
+                    "--immediate",
+                    "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
         node.start()
@@ -290,7 +294,6 @@ def test_page_multiple_segments(self):
             pg_options={
                 'wal_level': 'replica',
                 'max_wal_senders': '2',
-                'ptrack_enable': 'on',
                 'fsync': 'off',
                 'shared_buffers': '1GB',
                 'maintenance_work_mem': '1GB',