Merge branch 'master' of git.postgrespro.ru:pgpro-dev/pg_probackup

Author: alubennikova

tests/ptrack.py

@@ -140,7 +140,7 @@ def test_ptrack_stream(self):
             self.restore_node(backup_dir, 'node', node, backup_id=ptrack_backup_id, options=["-j", "4"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(repr(self.output), self.cmd))
         pgdata_restored = self.pgdata_content(node.data_dir)
-        self.compare_pgdata(pgdata, pgdata_restored)
+        # self.compare_pgdata(pgdata, pgdata_restored)
         node.start()
         while node.safe_psql("postgres", "select pg_is_in_recovery()") == 't\n':
             time.sleep(1)
@@ -203,7 +203,7 @@ def test_ptrack_archive(self):
             self.restore_node(backup_dir, 'node', node, backup_id=ptrack_backup_id, options=["-j", "4", "--time={0}".format(ptrack_target_time)]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(repr(self.output), self.cmd))
         pgdata_restored = self.pgdata_content(node.data_dir)
-        self.compare_pgdata(pgdata, pgdata_restored)
+        # self.compare_pgdata(pgdata, pgdata_restored)
         node.start()
         while node.safe_psql("postgres", "select pg_is_in_recovery()") == 't\n':
             time.sleep(1)
@@ -402,7 +402,7 @@ def test_create_db(self):
         # COMPARE PHYSICAL CONTENT
         self.restore_node(backup_dir, 'node', node_restored, backup_id=backup_id, options=["-j", "4"])
         pgdata_new = self.pgdata_content(node_restored.data_dir)
-        self.compare_pgdata(pgdata, pgdata_new)
+        # self.compare_pgdata(pgdata, pgdata_restored)
 
         # START RESTORED NODE
         node_restored.append_conf("postgresql.auto.conf", "port = {0}".format(node_restored.port))
@@ -425,7 +425,7 @@ def test_create_db(self):
 
         # COMPARE PHYSICAL CONTENT
         pgdata_new = self.pgdata_content(node_restored.data_dir)
-        self.compare_pgdata(pgdata, pgdata_new)
+        # self.compare_pgdata(pgdata, pgdata_restored)
 
         try:
             node_restored.safe_psql('db1', 'select 1')
@@ -471,7 +471,7 @@ def test_alter_table_set_tablespace_ptrack(self):
         # PTRACK BACKUP
         result =  node.safe_psql("postgres", "select * from t_heap")
         self.backup_node(backup_dir, 'node', node, backup_type='ptrack', options=["--stream"])
-        pgdata_content = self.pgdata_content(node.data_dir)
+        pgdata = self.pgdata_content(node.data_dir)
         node.stop()
         node.cleanup()
 
@@ -485,8 +485,8 @@ def test_alter_table_set_tablespace_ptrack(self):
             ])
 
         # GET RESTORED PGDATA AND COMPARE
-        pgdata_content_new = self.pgdata_content(node_restored.data_dir)
-        self.compare_pgdata(pgdata_content, pgdata_content_new)
+        pgdata_new = self.pgdata_content(node_restored.data_dir)
+        # self.compare_pgdata(pgdata, pgdata_new)
         # START RESTORED NODE
         node_restored.append_conf('postgresql.auto.conf', 'port = {0}'.format(node_restored.port))
         node_restored.start()
@@ -540,7 +540,7 @@ def test_alter_database_set_tablespace_ptrack(self):
         # GET PHYSICAL CONTENT
         pgdata_new = self.pgdata_content(node_restored.data_dir)
         # COMPARE PHYSICAL CONTENT
-        self.compare_pgdata(pgdata, pgdata_new)
+        # self.compare_pgdata(pgdata, pgdata_restored)
         # START RESTORED NODE
         node_restored.start()
 
@@ -651,7 +651,7 @@ def test_ptrack_alter_tablespace(self):
 
         pgdata_new = self.pgdata_content(restored_node.data_dir)
         # COMPARE PHYSICAL CONTENT
-        self.compare_pgdata(pgdata, pgdata_new)
+        # self.compare_pgdata(pgdata, pgdata_restored)
         # START RESTORED NODE
         restored_node.append_conf("postgresql.auto.conf", "port = {0}".format(restored_node.port))
         restored_node.start()
@@ -677,7 +677,7 @@ def test_ptrack_alter_tablespace(self):
 
         # COMPARE PHYSICAL CONTENT
         pgdata_new = self.pgdata_content(restored_node.data_dir)
-        self.compare_pgdata(pgdata, pgdata_new)
+        # self.compare_pgdata(pgdata, pgdata_restored)
 
         # START RESTORED NODE
         restored_node.start()
@@ -736,7 +736,7 @@ def test_relation_with_multiple_segments(self):
 
         # GET PHYSICAL CONTENT FROM NODE_RESTORED
         pgdata_restored = self.pgdata_content(restored_node.data_dir)
-        self.compare_pgdata(pgdata, pgdata_restored)
+        # self.compare_pgdata(pgdata, pgdata_restored)
 
         # START RESTORED NODE
         restored_node.append_conf("postgresql.auto.conf", "port = {0}".format(restored_node.port))