Commitde4c84e

vshepard

committed

Change tmp_path

1 parenta6f88fd commitde4c84eCopy full SHA for de4c84e

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,16 +74,13 @@ def __init__(self):`
`74`	`74`	`self._test_env=test_env`
`75`	`75`
`76`	`76`	`# Get the directory from which the script was executed`
`77`		`-helpers_path=os.getcwd()`
`78`		`-self.tests_source_path=os.path.abspath(`
`79`		`-os.path.join(helpers_path,os.pardir)`
`80`		`- )`
	`77`	`+self.source_path=os.getcwd()`
`81`	`78`	`tmp_path=test_env.get('PGPROBACKUP_TMP_DIR')`
`82`	`79`	`iftmp_pathandos.path.isabs(tmp_path):`
`83`	`80`	`self.tmp_path=tmp_path`
`84`	`81`	`else:`
`85`	`82`	`self.tmp_path=os.path.abspath(`
`86`		`-os.path.join(self.tests_source_path,tmp_pathor'tmp_dirs')`
	`83`	`+os.path.join(self.source_path,tmp_pathor'tmp_dirs')`
`87`	`84`	`)`
`88`	`85`
`89`	`86`	`os.makedirs(self.tmp_path,exist_ok=True)`
`@@ -110,8 +107,7 @@ def __init__(self):`
`110`	`107`	`self.probackup_path=probackup_path_tmp`
`111`	`108`
`112`	`109`	`ifnotself.probackup_path:`
`113`		`-probackup_path_tmp=os.path.abspath(os.path.join(`
`114`		`-self.tests_source_path,'../pg_probackup'))`
	`110`	`+probackup_path_tmp=self.source_path`
`115`	`111`
`116`	`112`	`ifos.path.isfile(probackup_path_tmp):`
`117`	`113`	`ifnotos.access(probackup_path_tmp,os.X_OK):`

Comments

(0)