tests: fixes for Windows

Author: gsmolk

tests/delete.py

@@ -148,9 +148,9 @@ def test_delete_increment_ptrack(self):
 
         # full backup mode
         self.backup_node(backup_dir, 'node', node)
-        # page backup mode
+        # ptrack backup mode
         self.backup_node(backup_dir, 'node', node, backup_type="ptrack")
-        # page backup mode
+        # ptrack backup mode
         self.backup_node(backup_dir, 'node', node, backup_type="ptrack")
         # full backup mode
         self.backup_node(backup_dir, 'node', node)
@@ -249,8 +249,7 @@ def test_delete_backup_with_empty_control_file(self):
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
             initdb_params=['--data-checksums'],
-            set_replication=True,
-            pg_options={'ptrack_enable': 'on'})
+            set_replication=True)
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)

tests/delta.py

@@ -1268,7 +1268,9 @@ def test_delta_nullified_heap_page_backup(self):
             backup_dir, 'node', node)
 
         # Nullify some block in PostgreSQL
-        file = os.path.join(node.data_dir, file_path)
+        file = os.path.join(node.data_dir, file_path).replace("\\","/")
+        if os.name == 'nt':
+            file = file.replace("\\","/")
 
         with open(file, 'r+b', 0) as f:
             f.seek(8192)
@@ -1286,10 +1288,14 @@ def test_delta_nullified_heap_page_backup(self):
         if not self.remote:
             log_file_path = os.path.join(backup_dir, "log", "pg_probackup.log")
             with open(log_file_path) as f:
-                self.assertTrue("LOG: File: {0} blknum 1, empty page".format(
-                    file) in f.read())
-                self.assertFalse("Skipping blknum: 1 in file: {0}".format(
-                    file) in f.read())
+                content = f.read()
+
+            self.assertIn(
+                "LOG: File: {0} blknum 1, empty page".format(file),
+                content)
+            self.assertNotIn(
+                "Skipping blknum: 1 in file: {0}".format(file),
+                 content)
 
         # Restore DELTA backup
         node_restored = self.make_simple_node(

tests/merge.py

@@ -485,7 +485,6 @@ def test_merge_tablespaces(self):
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True, initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'autovacuum': 'off'
             }
         )
@@ -564,7 +563,6 @@ def test_merge_tablespaces_1(self):
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True, initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'autovacuum': 'off'
             }
         )
@@ -648,7 +646,6 @@ def test_merge_page_truncate(self):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s',
                 'autovacuum': 'off'
             }
@@ -742,7 +739,6 @@ def test_merge_delta_truncate(self):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s',
                 'autovacuum': 'off'
             }
@@ -836,7 +832,6 @@ def test_merge_ptrack_truncate(self):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '300s',
                 'autovacuum': 'off',
                 'ptrack_enable': 'on'
@@ -930,7 +925,6 @@ def test_merge_delta_delete(self):
             base_dir=os.path.join(module_name, fname, 'node'),
             set_replication=True, initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'checkpoint_timeout': '30s',
                 'autovacuum': 'off'
             }
@@ -1683,7 +1677,6 @@ def test_merge_backup_from_future(self):
             set_replication=True,
             initdb_params=['--data-checksums'],
             pg_options={
-                'max_wal_senders': '2',
                 'autovacuum': 'off'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')

tests/page.py

@@ -911,7 +911,7 @@ def test_page_backup_with_alien_wal_segment(self):
             "create table t_heap_alien as select i as id, "
             "md5(i::text) as text, "
             "md5(repeat(i::text,10))::tsvector as tsvector "
-            "from generate_series(0,1000) i;")
+            "from generate_series(0,100000) i;")
 
         # copy lastest wal segment
         wals_dir = os.path.join(backup_dir, 'wal', 'alien_node')
@@ -925,6 +925,7 @@ def test_page_backup_with_alien_wal_segment(self):
 #        file = os.path.join(wals_dir, '000000010000000000000004')
         print(file)
         print(file_destination)
+        os.remove(file_destination)
         os.rename(file, file_destination)
 
         # Single-thread PAGE backup
@@ -944,8 +945,7 @@ def test_page_backup_with_alien_wal_segment(self):
                 'Could not read WAL record at' in e.message and
                 'WAL file is from different database system: WAL file database system identifier is' in e.message and
                 'pg_control database system identifier is' in e.message and
-                'Possible WAL corruption. Error has occured during reading WAL segment "{0}"'.format(
-                    file_destination) in e.message,
+                'Possible WAL corruption. Error has occured during reading WAL segment' in e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
 
@@ -971,8 +971,7 @@ def test_page_backup_with_alien_wal_segment(self):
                 'Could not read WAL record at' in e.message and
                 'WAL file is from different database system: WAL file database system identifier is' in e.message and
                 'pg_control database system identifier is' in e.message and
-                'Possible WAL corruption. Error has occured during reading WAL segment "{0}"'.format(
-                    file_destination) in e.message,
+                'Possible WAL corruption. Error has occured during reading WAL segment' in e.message,
                 '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                     repr(e.message), self.cmd))
 

tests/retention.py

@@ -762,7 +762,8 @@ def test_window_merge_multiple_descendants(self):
         fname = self.id().split('.')[3]
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
-            initdb_params=['--data-checksums'])
+            initdb_params=['--data-checksums'],
+            pg_options={'autovacuum': 'off'})
 
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         self.init_pb(backup_dir)