Commita07f106

vshepard

committed

Add expect_error to pg_upgrade

1 parent4543f80 commita07f106Copy full SHA for a07f106

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1627,7 +1627,7 @@ def set_auto_conf(self, options, config='postgresql.auto.conf', rm_options={}):`
`1627`	`1627`
`1628`	`1628`	`self.os_ops.write(path,auto_conf,truncate=True)`
`1629`	`1629`
`1630`		`-defupgrade_from(self,old_node,options=None):`
	`1630`	`+defupgrade_from(self,old_node,options=None,expect_error=False):`
`1631`	`1631`	`"""`
`1632`	`1632`	`Upgrade this node from an old node using pg_upgrade.`
`1633`	`1633`
`@@ -1656,10 +1656,11 @@ def upgrade_from(self, old_node, options=None):`
`1656`	`1656`	`"--new-datadir",self.data_dir,`
`1657`	`1657`	`"--old-port",str(old_node.port),`
`1658`	`1658`	`"--new-port",str(self.port),`
	`1659`	`+"--copy"`
`1659`	`1660`	`]`
`1660`	`1661`	`upgrade_command+=options`
`1661`	`1662`
`1662`		`-returnself.os_ops.exec_command(upgrade_command)`
	`1663`	`+returnself.os_ops.exec_command(upgrade_command,expect_error=expect_error)`
`1663`	`1664`
`1664`	`1665`	`def_get_bin_path(self,filename):`
`1665`	`1666`	`ifself.bin_dir:`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,18 @@`
`19`	`19`
`20`	`20`	`CMD_TIMEOUT_SEC=60`
`21`	`21`	`error_markers= [b'error',b'Permission denied',b'fatal']`
	`22`	`+err_out_markers= [b'Failure']`
`22`	`23`
`23`	`24`
`24`		`-defhas_errors(output):`
	`25`	`+defhas_errors(output=None,error=None):`
`25`	`26`	`ifoutput:`
`26`	`27`	`ifisinstance(output,str):`
`27`	`28`	`output=output.encode(get_default_encoding())`
`28`		`-returnany(markerinoutputformarkerinerror_markers)`
	`29`	`+returnany(markerinoutputformarkerinerr_out_markers)`
	`30`	`+iferror:`
	`31`	`+ifisinstance(error,str):`
	`32`	`+error=error.encode(get_default_encoding())`
	`33`	`+returnany(markerinerrorformarkerinerror_markers)`
`29`	`34`	`returnFalse`
`30`	`35`
`31`	`36`
`@@ -107,8 +112,8 @@ def exec_command(self, cmd, wait_exit=False, verbose=False, expect_error=False,`
`107`	`112`	`process,output,error=self._run_command(cmd,shell,input,stdin,stdout,stderr,get_process,timeout,encoding)`
`108`	`113`	`ifget_process:`
`109`	`114`	`returnprocess`
`110`		`-ifprocess.returncode!=0or(has_errors(error)andnotexpect_error):`
`111`		-self._raise_exec_exception('Utility exited with non-zero code. Error `{}`',cmd,process.returncode,error)
	`115`	`+if(process.returncode!=0orhas_errors(output=output,error=error))andnotexpect_error:`
	`116`	+self._raise_exec_exception('Utility exited with non-zero code. Error `{}`',cmd,process.returncode,errororoutput)
`112`	`117`
`113`	`118`	`ifverbose:`
`114`	`119`	`returnprocess.returncode,output,error`

Comments

(0)