Commit2593e10

s.logvinenko

authored and

s.logvinenko

committed

Conflicts:tests/__init__.py

1 parent269a83c commit2593e10Copy full SHA for 2593e10

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`importsubprocess`
`5`	`5`	`importshutil`
`6`	`6`	`importsix`
`7`		`-fromtestgresimportget_new_node,clean_all`
	`7`	`+importtestgres`
`8`	`8`	`importhashlib`
`9`	`9`	`importre`
`10`	`10`	`importpwd`
`@@ -153,7 +153,7 @@ def make_simple_node(`
`153`	`153`	`real_base_dir=os.path.join(self.tmp_path,base_dir)`
`154`	`154`	`shutil.rmtree(real_base_dir,ignore_errors=True)`
`155`	`155`
`156`		`-node=get_new_node('test',base_dir=real_base_dir)`
	`156`	`+node=testgres.get_new_node('test',base_dir=real_base_dir)`
`157`	`157`	`node.init(initdb_params=initdb_params)`
`158`	`158`
`159`	`159`	`# Sane default parameters, not a shit with fsync = off from testgres`
`@@ -585,7 +585,7 @@ def get_username(self):`
`585`	`585`	`defdel_test_dir(self,module_name,fname):`
`586`	`586`	`""" Del testdir and optimistically try to del module dir"""`
`587`	`587`	`try:`
`588`		`-clean_all()`
	`588`	`+testgres.clean_all()`
`589`	`589`	`except:`
`590`	`590`	`pass`
`591`	`591`

Comments

(0)