Commitab2d595

committed

tests: fixes

1 parent05d8ecc commitab2d595Copy full SHA for ab2d595

File tree

+15

-12

lines changed

+15

-12

lines changed

Lines changed: 10 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -256,15 +256,16 @@ def test_pgpro434_3(self):`
`256`	`256`	`withopen(log_file,'r')asf:`
`257`	`257`	`log_content=f.read()`
`258`	`258`
`259`		`-self.assertIn(`
`260`		`-"ERROR: Switched WAL segment 000000010000000000000002 "`
`261`		`-"could not be archived in 60 seconds",`
`262`		`-log_content)`
`263`		`-`
`264`		`-self.assertIn(`
`265`		`-"ERROR: Switched WAL segment 000000010000000000000002 "`
`266`		`-"could not be archived in 60 seconds",`
`267`		`-log_content)`
	`259`	`+# in PG =< 9.6 pg_stop_backup always wait`
	`260`	`+ifself.get_version(node)<100000:`
	`261`	`+self.assertIn(`
	`262`	`+"ERROR: pg_stop_backup doesn't answer in 60 seconds, cancel it",`
	`263`	`+log_content)`
	`264`	`+else:`
	`265`	`+self.assertIn(`
	`266`	`+"ERROR: Switched WAL segment 000000010000000000000002 "`
	`267`	`+"could not be archived in 60 seconds",`
	`268`	`+log_content)`
`268`	`269`
`269`	`270`	`log_file=os.path.join(node.logs_dir,'postgresql.log')`
`270`	`271`	`withopen(log_file,'r')asf:`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1540,8 +1540,8 @@ def test_crash_after_opening_backup_control_2(self):`
`1540`	`1540`	`gdb.set_breakpoint('write_backup_filelist')`
`1541`	`1541`	`gdb.run_until_break()`
`1542`	`1542`
`1543`		`-gdb.set_breakpoint('print_file_list')`
`1544`		`-gdb.continue_execution_until_break()`
	`1543`	`+gdb.set_breakpoint('fio_fwrite')`
	`1544`	`+gdb.continue_execution_until_break(2)`
`1545`	`1545`
`1546`	`1546`	`gdb._execute('signal SIGKILL')`
`1547`	`1547`
`@@ -1631,9 +1631,11 @@ def test_losing_file_after_failed_merge(self):`
`1631`	`1631`	`gdb.set_breakpoint('write_backup_filelist')`
`1632`	`1632`	`gdb.run_until_break()`
`1633`	`1633`
`1634`		`-gdb.set_breakpoint('print_file_list')`
	`1634`	`+gdb.set_breakpoint('fio_fwrite')`
`1635`	`1635`	`gdb.continue_execution_until_break()`
`1636`	`1636`
	`1637`	`+gdb._execute('bt')`
	`1638`	`+`
`1637`	`1639`	`gdb._execute('signal SIGKILL')`
`1638`	`1640`
`1639`	`1641`	`print(self.show_pb(`

Comments

(0)