Commit677271a

committed

Unbreak recovery test on Windows

On Windows we need to send explicit quit messages to psql or the TAP testscan hang.

1 parent9fb9691 commit677271aCopy full SHA for 677271a

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -124,8 +124,10 @@ BEGIN`
`124`	`124`	`my$ret = TestLib::system_log('pg_ctl','kill','KILL',$pid);`
`125`	`125`	`is($ret, 0,'killed process with KILL');`
`126`	`126`
`127`		`-# Close psql session`
	`127`	`+# Explicitly shut down psql gracefully - to avoid hangs or worse on windows`
	`128`	`+$killme_stdin .="\\q\n";`
`128`	`129`	`$killme->finish;`
	`130`	`+$killme_stdin2 .="\\q\n";`
`129`	`131`	`$killme2->finish;`
`130`	`132`
`131`	`133`	`# Wait till server restarts`
`@@ -212,8 +214,10 @@ BEGIN`
`212`	`214`	`$ret = TestLib::system_log('pg_ctl','kill','KILL',$pid);`
`213`	`215`	`is($ret, 0,'killed process with KILL');`
`214`	`216`
`215`		`-# Close psql session`
	`217`	`+# Explicitly shut down psql gracefully - to avoid hangs or worse on windows`
	`218`	`+$killme_stdin .="\\q\n";`
`216`	`219`	`$killme->finish;`
	`220`	`+$killme_stdin2 .="\\q\n";`
`217`	`221`	`$killme2->finish;`
`218`	`222`
`219`	`223`	`# Wait till server restarts`

Comments

(0)