tests: minor fixes

Author: gsmolk

tests/backup_test.py

@@ -338,7 +338,7 @@ def test_page_corruption_heal_via_ptrack_1(self):
         with open(os.path.join(backup_dir, 'log', 'pg_probackup.log')) as f:
             log_content = f.read()
             self.assertIn('block 1, try to fetch via SQL', log_content)
-            self.assertIn('SELECT pg_ptrack_get_block', log_content)
+            self.assertIn('SELECT pg_catalog.pg_ptrack_get_block', log_content)
             f.close
 
         self.assertTrue(
@@ -410,7 +410,7 @@ def test_page_corruption_heal_via_ptrack_2(self):
                 "calculated checksum" in e.message and
                 "ERROR: query failed: "
                 "ERROR:  invalid page in block" in e.message and
-                "query was: SELECT pg_ptrack_get_block_2" in e.message,
+                "query was: SELECT pg_catalog.pg_ptrack_get_block_2" in e.message,
                 "\n Unexpected Error Message: {0}\n CMD: {1}".format(
                     repr(e.message), self.cmd))
 

tests/helpers/ptrack_helpers.py

@@ -96,7 +96,7 @@ def is_enterprise():
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE
     )
-    if 'postgrespro.ru' in p.communicate()[0]:
+    if b'postgrespro.ru' in p.communicate()[0]:
         return True
     else:
         return False

tests/restore_test.py

@@ -837,6 +837,9 @@ def test_archive_node_backup_archive_pitr_2(self):
         node.start()
 
         backup_id = self.backup_node(backup_dir, 'node', node)
+        if self.paranoia:
+            pgdata = self.pgdata_content(node.data_dir)
+
         node.safe_psql("postgres", "create table t_heap(a int)")
         node.stop()
         node.cleanup()
@@ -848,6 +851,10 @@ def test_archive_node_backup_archive_pitr_2(self):
                 options=["-j", "4", '--time={0}'.format(recovery_time)]),
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(repr(self.output), self.cmd))
 
+        if self.paranoia:
+            pgdata_restored = self.pgdata_content(node.data_dir)
+            self.compare_pgdata(pgdata, pgdata_restored)
+
         node.start()
         while node.safe_psql("postgres", "select pg_is_in_recovery()") == 't\n':
             time.sleep(1)