Commit23b00b1

committed

tests: set env for run_binary

1 parent1c860ff commit23b00b1Copy full SHA for 23b00b1

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2030,7 +2030,9 @@ def test_archive_pg_receivexlog_partial_handling(self):`
`2030`	`2030`	`ifself.archive_compressandnode.major_version>=10:`
`2031`	`2031`	`cmdline+= ['-Z','1']`
`2032`	`2032`
`2033`		`-pg_receivexlog=self.run_binary(cmdline,asynchronous=True)`
	`2033`	`+env=self.test_env`
	`2034`	`+env["PGAPPNAME"]=app_name`
	`2035`	`+pg_receivexlog=self.run_binary(cmdline,asynchronous=True,env)`
`2034`	`2036`
`2035`	`2037`	`ifpg_receivexlog.returncode:`
`2036`	`2038`	`self.assertFalse(`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,11 @@ def run_pb(self, command, asynchronous=False, gdb=False, old_binary=False, retur`
`779`	`779`	`exceptsubprocess.CalledProcessErrorase:`
`780`	`780`	`raiseProbackupException(e.output.decode('utf-8'),self.cmd)`
`781`	`781`
`782`		`-defrun_binary(self,command,asynchronous=False):`
	`782`	`+defrun_binary(self,command,asynchronous=False,env=None):`
	`783`	`+`
	`784`	`+ifnotenv:`
	`785`	`+env=self.test_env`
	`786`	`+`
`783`	`787`	`ifself.verbose:`
`784`	`788`	`print([' '.join(map(str,command))])`
`785`	`789`	`try:`
`@@ -789,13 +793,13 @@ def run_binary(self, command, asynchronous=False):`
`789`	`793`	`stdin=subprocess.PIPE,`
`790`	`794`	`stdout=subprocess.PIPE,`
`791`	`795`	`stderr=subprocess.PIPE,`
`792`		`-env=self.test_env`
	`796`	`+env=env`
`793`	`797`	`)`
`794`	`798`	`else:`
`795`	`799`	`self.output=subprocess.check_output(`
`796`	`800`	`command,`
`797`	`801`	`stderr=subprocess.STDOUT,`
`798`		`-env=self.test_env`
	`802`	`+env=env`
`799`	`803`	`).decode('utf-8')`
`800`	`804`	`returnself.output`
`801`	`805`	`exceptsubprocess.CalledProcessErrorase:`

Comments

(0)