Commit190d084

v.shepard

committed

PBCKP-588 fixes after review - replace subprocess.run on subprocess.Popen

1 parent089ab9b commit190d084Copy full SHA for 190d084

File tree

-8

lines changed

-8

lines changed

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,27 +60,26 @@ def exec_command(self, cmd, wait_exit=False, verbose=False,`
`60`	`60`	`result=buf.read().decode(encoding)`
`61`	`61`	`returnresult`
`62`	`62`	`else:`
`63`		`-ifproc:`
`64`		`-returnsubprocess.Popen(cmd,shell=shell,stdin=input,stdout=stdout,stderr=stderr)`
`65`		`-process=subprocess.run(`
	`63`	`+process=subprocess.Popen(`
`66`	`64`	`cmd,`
`67`		`-input=input,`
`68`	`65`	`shell=shell,`
`69`		`-text=text,`
`70`	`66`	`stdout=stdout,`
`71`	`67`	`stderr=stderr,`
`72`		`-timeout=CMD_TIMEOUT_SEC,`
`73`	`68`	`)`
	`69`	`+ifproc:`
	`70`	`+returnprocess`
	`71`	`+result,error=process.communicate(input)`
`74`	`72`	`exit_status=process.returncode`
`75`		`-result=process.stdout`
`76`		`-error=process.stderr`
	`73`	`+`
`77`	`74`	`found_error="error"inerror.decode(encodingor'utf-8').lower()`
	`75`	`+`
`78`	`76`	`ifencoding:`
`79`	`77`	`result=result.decode(encoding)`
`80`	`78`	`error=error.decode(encoding)`
`81`	`79`
`82`	`80`	`ifexpect_error:`
`83`	`81`	`raiseException(result,error)`
	`82`	`+`
`84`	`83`	`ifexit_status!=0orfound_error:`
`85`	`84`	`ifexit_status==0:`
`86`	`85`	`exit_status=1`

Comments

(0)