@@ -705,8 +705,7 @@ def test_page_backup_with_lost_wal_segment(self):
705705'INFO: Wait for LSN' in e .message and
706706'in archived WAL segment' in e .message and
707707'Could not read WAL record at' in e .message and
708- 'WAL segment "{0}" is absent\n ' .format (
709- file )in e .message ,
708+ 'is absent' in e .message ,
710709'\n Unexpected Error Message: {0}\n CMD: {1}' .format (
711710repr (e .message ),self .cmd ))
712711
@@ -823,8 +822,7 @@ def test_page_backup_with_corrupted_wal_segment(self):
823822'in archived WAL segment' in e .message and
824823'Could not read WAL record at' in e .message and
825824'incorrect resource manager data checksum in record at' in e .message and
826- 'Possible WAL corruption. Error has occured during reading WAL segment "{0}"' .format (
827- file )in e .message ,
825+ 'Possible WAL corruption. Error has occured during reading WAL segment' in e .message ,
828826'\n Unexpected Error Message: {0}\n CMD: {1}' .format (
829827repr (e .message ),self .cmd ))
830828
@@ -1093,14 +1091,14 @@ def test_page_create_db(self):
10931091# DROP DATABASE DB1
10941092node .safe_psql (
10951093"postgres" ,"drop database db1" )
1096- # SECONDPTRACK BACKUP
1094+ # SECONDPAGE BACKUP
10971095backup_id = self .backup_node (
10981096backup_dir ,'node' ,node ,backup_type = 'page' )
10991097
11001098if self .paranoia :
11011099pgdata = self .pgdata_content (node .data_dir )
11021100
1103- # RESTORE SECONDPTRACK BACKUP
1101+ # RESTORE SECONDPAGE BACKUP
11041102self .restore_node (
11051103backup_dir ,'node' ,node_restored ,
11061104backup_id = backup_id ,options = ["-j" ,"4" ]