tests: move to python3

Author: gsmolk

tests/Readme.md

@@ -34,7 +34,7 @@ Run ptrack tests:
 
 
 Usage:
- pip install testgres==1.8.2
+ pip install testgres
  export PG_CONFIG=/path/to/pg_config
  python -m unittest [-v] tests[.specific_module][.class.test]
 ```

tests/archive.py

@@ -316,7 +316,7 @@ def test_pgpro434_4(self):
             "postgres",
             "SELECT pid "
             "FROM pg_stat_activity "
-            "WHERE application_name = 'pg_probackup'").rstrip()
+            "WHERE application_name = 'pg_probackup'").decode('utf-8').rstrip()
 
         os.environ["PGAPPNAME"] = "pg_probackup"
 
@@ -371,7 +371,7 @@ def test_archive_push_file_exists(self):
             filename = '000000010000000000000001'
             file = os.path.join(wals_dir, filename)
 
-        with open(file, 'a') as f:
+        with open(file, 'a+b') as f:
             f.write(b"blablablaadssaaaaaaaaaaaaaaa")
             f.flush()
             f.close()
@@ -458,7 +458,7 @@ def test_archive_push_file_exists_overwrite(self):
             filename = '000000010000000000000001'
             file = os.path.join(wals_dir, filename)
 
-        with open(file, 'a') as f:
+        with open(file, 'a+b') as f:
             f.write(b"blablablaadssaaaaaaaaaaaaaaa")
             f.flush()
             f.close()
@@ -538,7 +538,7 @@ def test_archive_push_partial_file_exists(self):
 
         xid = node.safe_psql(
             "postgres",
-            "INSERT INTO t1 VALUES (1) RETURNING (xmin)").rstrip()
+            "INSERT INTO t1 VALUES (1) RETURNING (xmin)").decode('utf-8').rstrip()
 
         if self.get_version(node) < 100000:
             filename_orig = node.safe_psql(
@@ -551,6 +551,8 @@ def test_archive_push_partial_file_exists(self):
                 "SELECT file_name "
                 "FROM pg_walfile_name_offset(pg_current_wal_flush_lsn());").rstrip()
 
+        filename_orig = filename_orig.decode('utf-8')
+
         # form up path to next .part WAL segment
         wals_dir = os.path.join(backup_dir, 'wal', 'node')
         if self.archive_compress:
@@ -561,7 +563,7 @@ def test_archive_push_partial_file_exists(self):
             file = os.path.join(wals_dir, filename)
 
         # emulate stale .part file
-        with open(file, 'a') as f:
+        with open(file, 'a+b') as f:
             f.write(b"blahblah")
             f.flush()
             f.close()
@@ -628,6 +630,8 @@ def test_archive_push_part_file_exists_not_stale(self):
                 "SELECT file_name "
                 "FROM pg_walfile_name_offset(pg_current_wal_flush_lsn());").rstrip()
 
+        filename_orig = filename_orig.decode('utf-8')
+
         # form up path to next .part WAL segment
         wals_dir = os.path.join(backup_dir, 'wal', 'node')
         if self.archive_compress:
@@ -637,15 +641,15 @@ def test_archive_push_part_file_exists_not_stale(self):
             filename = filename_orig + '.part'
             file = os.path.join(wals_dir, filename)
 
-        with open(file, 'a') as f:
+        with open(file, 'a+b') as f:
             f.write(b"blahblah")
             f.flush()
             f.close()
 
         self.switch_wal_segment(node)
         sleep(30)
 
-        with open(file, 'a') as f:
+        with open(file, 'a+b') as f:
             f.write(b"blahblahblahblah")
             f.flush()
             f.close()
@@ -2378,6 +2382,8 @@ def test_archive_show_partial_files_handling(self):
                 "SELECT file_name "
                 "FROM pg_walfile_name_offset(pg_current_wal_flush_lsn())").rstrip()
 
+        filename = filename.decode('utf-8')
+
         self.switch_wal_segment(node)
 
         os.rename(
@@ -2400,6 +2406,8 @@ def test_archive_show_partial_files_handling(self):
                 "SELECT file_name "
                 "FROM pg_walfile_name_offset(pg_current_wal_flush_lsn())").rstrip()
 
+        filename = filename.decode('utf-8')
+
         self.switch_wal_segment(node)
 
         os.rename(
@@ -2422,6 +2430,8 @@ def test_archive_show_partial_files_handling(self):
                 "SELECT file_name "
                 "FROM pg_walfile_name_offset(pg_current_wal_flush_lsn())").rstrip()
 
+        filename = filename.decode('utf-8')
+
         self.switch_wal_segment(node)
 
         os.rename(
@@ -2444,6 +2454,8 @@ def test_archive_show_partial_files_handling(self):
                 "SELECT file_name "
                 "FROM pg_walfile_name_offset(pg_current_wal_flush_lsn())").rstrip()
 
+        filename = filename.decode('utf-8')
+
         self.switch_wal_segment(node)
 
         os.rename(

tests/backup.py

@@ -349,7 +349,7 @@ def test_page_detect_corruption(self):
 
         heap_path = node.safe_psql(
             "postgres",
-            "select pg_relation_filepath('t_heap')").rstrip()
+            "select pg_relation_filepath('t_heap')").decode('utf-8').rstrip()
 
         path = os.path.join(node.data_dir, heap_path)
         with open(path, "rb+", 0) as f:
@@ -416,7 +416,7 @@ def test_backup_detect_corruption(self):
 
         heap_path = node.safe_psql(
             "postgres",
-            "select pg_relation_filepath('t_heap')").rstrip()
+            "select pg_relation_filepath('t_heap')").decode('utf-8').rstrip()
 
         self.backup_node(
             backup_dir, 'node', node,
@@ -558,7 +558,7 @@ def test_backup_detect_invalid_block_header(self):
 
         heap_path = node.safe_psql(
             "postgres",
-            "select pg_relation_filepath('t_heap')").rstrip()
+            "select pg_relation_filepath('t_heap')").decode('utf-8').rstrip()
 
         self.backup_node(
             backup_dir, 'node', node,
@@ -699,7 +699,7 @@ def test_backup_detect_missing_permissions(self):
 
         heap_path = node.safe_psql(
             "postgres",
-            "select pg_relation_filepath('t_heap')").rstrip()
+            "select pg_relation_filepath('t_heap')").decode('utf-8').rstrip()
 
         self.backup_node(
             backup_dir, 'node', node,
@@ -840,7 +840,7 @@ def test_backup_truncate_misaligned(self):
 
         heap_path = node.safe_psql(
             "postgres",
-            "select pg_relation_filepath('t_heap')").rstrip()
+            "select pg_relation_filepath('t_heap')").decode('utf-8').rstrip()
 
         heap_size = node.safe_psql(
             "postgres",
@@ -922,7 +922,7 @@ def test_tablespace_in_pgdata_pgpro_1376(self):
         relfilenode = node.safe_psql(
             "postgres",
             "select 't_heap1'::regclass::oid"
-            ).rstrip()
+            ).decode('utf-8').rstrip()
 
         list = []
         for root, dirs, files in os.walk(os.path.join(
@@ -1205,11 +1205,11 @@ def test_drop_rel_during_full_backup(self):
 
         relative_path_1 = node.safe_psql(
             "postgres",
-            "select pg_relation_filepath('t_heap_1')").rstrip()
+            "select pg_relation_filepath('t_heap_1')").decode('utf-8').rstrip()
 
         relative_path_2 = node.safe_psql(
             "postgres",
-            "select pg_relation_filepath('t_heap_1')").rstrip()
+            "select pg_relation_filepath('t_heap_1')").decode('utf-8').rstrip()
 
         absolute_path_1 = os.path.join(node.data_dir, relative_path_1)
         absolute_path_2 = os.path.join(node.data_dir, relative_path_2)
@@ -1350,7 +1350,7 @@ def test_drop_rel_during_backup_delta(self):
 
         relative_path = node.safe_psql(
             "postgres",
-            "select pg_relation_filepath('t_heap')").rstrip()
+            "select pg_relation_filepath('t_heap')").decode('utf-8').rstrip()
 
         absolute_path = os.path.join(node.data_dir, relative_path)
 
@@ -1418,7 +1418,7 @@ def test_drop_rel_during_backup_page(self):
 
         relative_path = node.safe_psql(
             "postgres",
-            "select pg_relation_filepath('t_heap')").rstrip()
+            "select pg_relation_filepath('t_heap')").decode('utf-8').rstrip()
 
         absolute_path = os.path.join(node.data_dir, relative_path)
 
@@ -1443,6 +1443,7 @@ def test_drop_rel_during_backup_page(self):
 
         # File removed, we can proceed with backup
         gdb.continue_execution_until_exit()
+        gdb.kill()
 
         pgdata = self.pgdata_content(node.data_dir)
 
@@ -1492,7 +1493,7 @@ def test_drop_rel_during_backup_ptrack(self):
 
         relative_path = node.safe_psql(
             "postgres",
-            "select pg_relation_filepath('t_heap')").rstrip()
+            "select pg_relation_filepath('t_heap')").decode('utf-8').rstrip()
 
         absolute_path = os.path.join(node.data_dir, relative_path)
 
@@ -1637,6 +1638,7 @@ def test_backup_concurrent_drop_table(self):
 
         gdb.remove_all_breakpoints()
         gdb.continue_execution_until_exit()
+        gdb.kill()
 
         show_backup = self.show_pb(backup_dir, 'node')[0]
 
@@ -1761,6 +1763,7 @@ def test_sigint_handling(self):
 
         gdb._execute('signal SIGINT')
         gdb.continue_execution_until_error()
+        gdb.kill()
 
         backup_id = self.show_pb(backup_dir, 'node')[0]['id']
 
@@ -1901,7 +1904,7 @@ def test_basic_missing_file_permissions(self):
 
         relative_path = node.safe_psql(
             "postgres",
-            "select pg_relation_filepath('pg_class')").rstrip()
+            "select pg_relation_filepath('pg_class')").decode('utf-8').rstrip()
 
         full_path = os.path.join(node.data_dir, relative_path)
 

tests/checkdb.py

@@ -259,13 +259,13 @@ def test_basic_checkdb_amcheck_only_sanity(self):
             node.data_dir,
             node.safe_psql(
                 "db1",
-                "select pg_relation_filepath('pgbench_accounts_pkey')").rstrip())
+                "select pg_relation_filepath('pgbench_accounts_pkey')").decode('utf-8').rstrip())
 
         index_path_2 = os.path.join(
             node.data_dir,
             node.safe_psql(
                 "db2",
-                "select pg_relation_filepath('some_index')").rstrip())
+                "select pg_relation_filepath('some_index')").decode('utf-8').rstrip())
 
         try:
             self.checkdb_node(
@@ -376,7 +376,7 @@ def test_checkdb_block_validation_sanity(self):
 
         heap_path = node.safe_psql(
             "postgres",
-            "select pg_relation_filepath('t_heap')").rstrip()
+            "select pg_relation_filepath('t_heap')").decode('utf-8').rstrip()
 
         # sanity
         try:
@@ -473,14 +473,15 @@ def test_checkdb_sigint_handling(self):
         gdb = self.checkdb_node(
             backup_dir, 'node', gdb=True,
             options=[
-                '-d', 'postgres', '-j', '4',
+                '-d', 'postgres', '-j', '2',
                 '--skip-block-validation',
+                '--progress',
                 '--amcheck', '-p', str(node.port)])
 
         gdb.set_breakpoint('amcheck_one_index')
         gdb.run_until_break()
 
-        gdb.continue_execution_until_break(10)
+        gdb.continue_execution_until_break(20)
         gdb.remove_all_breakpoints()
 
         gdb._execute('signal SIGINT')

tests/delta.py

@@ -206,7 +206,7 @@ def test_delta_vacuum_truncate_2(self):
         filepath = node.safe_psql(
             "postgres",
             "select pg_relation_filepath('t_heap')"
-        ).rstrip()
+        ).decode('utf-8').rstrip()
 
         self.backup_node(backup_dir, 'node', node)
 
@@ -708,7 +708,7 @@ def test_exists_in_previous_backup(self):
         node.safe_psql("postgres", "SELECT * FROM t_heap")
         filepath = node.safe_psql(
             "postgres",
-            "SELECT pg_relation_filepath('t_heap')").rstrip()
+            "SELECT pg_relation_filepath('t_heap')").decode('utf-8').rstrip()
         self.backup_node(
             backup_dir,
             'node',
@@ -1063,7 +1063,7 @@ def test_delta_nullified_heap_page_backup(self):
 
         file_path = node.safe_psql(
             "postgres",
-            "select pg_relation_filepath('pgbench_accounts')").rstrip()
+            "select pg_relation_filepath('pgbench_accounts')").decode('utf-8').rstrip()
 
         node.safe_psql(
             "postgres",

tests/exclude.py

@@ -227,7 +227,7 @@ def test_exclude_log_dir(self):
 
         log_dir = node.safe_psql(
             'postgres',
-            'show log_directory').rstrip()
+            'show log_directory').decode('utf-8').rstrip()
 
         node.cleanup()
 
@@ -264,7 +264,7 @@ def test_exclude_log_dir_1(self):
 
         log_dir = node.safe_psql(
             'postgres',
-            'show log_directory').rstrip()
+            'show log_directory').decode('utf-8').rstrip()
 
         self.backup_node(
             backup_dir, 'node', node,