Commita5cfdb6

vshepard

committed

Add bin_dir to make_simple

1 parentc0dca6b commita5cfdb6Copy full SHA for a5cfdb6

File tree

+24

-5

lines changed

+24

-5

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1707,12 +1707,13 @@ def __init__(self, test_path=None, nodes_to_cleanup=None, os_ops=LocalOperations`
`1707`	`1707`	`defmake_empty(`
`1708`	`1708`	`self,`
`1709`	`1709`	`base_dir=None,`
`1710`		`-port=None):`
	`1710`	`+port=None,`
	`1711`	`+bin_dir=None):`
`1711`	`1712`	`real_base_dir=os.path.join(self.test_path,base_dir)`
`1712`	`1713`	`self.os_ops.rmdirs(real_base_dir,ignore_errors=True)`
`1713`	`1714`	`self.os_ops.makedirs(real_base_dir)`
`1714`	`1715`
`1715`		`-node=PostgresNode(base_dir=real_base_dir,port=port)`
	`1716`	`+node=PostgresNode(base_dir=real_base_dir,port=port,bin_dir=bin_dir)`
`1716`	`1717`	`node.should_rm_dirs=True`
`1717`	`1718`	`self.nodes_to_cleanup.append(node)`
`1718`	`1719`
`@@ -1726,10 +1727,11 @@ def make_simple(`
`1726`	`1727`	`ptrack_enable=False,`
`1727`	`1728`	`initdb_params=[],`
`1728`	`1729`	`pg_options={},`
`1729`		`-checksum=True):`
	`1730`	`+checksum=True,`
	`1731`	`+bin_dir=None):`
`1730`	`1732`	`ifchecksumand'--data-checksums'notininitdb_params:`
`1731`	`1733`	`initdb_params.append('--data-checksums')`
`1732`		`-node=self.make_empty(base_dir,port)`
	`1734`	`+node=self.make_empty(base_dir,port,bin_dir=bin_dir)`
`1733`	`1735`	`node.init(`
`1734`	`1736`	`initdb_params=initdb_params,allow_streaming=set_replication)`
`1735`	`1737`

Lines changed: 18 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`BackupException, \`
`24`	`24`	`QueryException, \`
`25`	`25`	`TimeoutException, \`
`26`		`-TestgresException`
	`26`	`+TestgresException,NodeApp`
`27`	`27`
`28`	`28`	`fromtestgresimport \`
`29`	`29`	`TestgresConfig, \`
`@@ -1044,6 +1044,23 @@ def test_the_same_port(self):`
`1044`	`1044`	`node2.port=node.port`
`1045`	`1045`	`node2.init().start()`
`1046`	`1046`
	`1047`	`+deftest_make_simple_with_bin_dir(self):`
	`1048`	`+withget_new_node()asnode:`
	`1049`	`+node.init().start()`
	`1050`	`+bin_dir=node.bin_dir`
	`1051`	`+`
	`1052`	`+app=NodeApp()`
	`1053`	`+correct_bin_dir=app.make_simple(base_dir=node.base_dir,bin_dir=bin_dir)`
	`1054`	`+correct_bin_dir.slow_start()`
	`1055`	`+correct_bin_dir.safe_psql("SELECT 1;")`
	`1056`	`+`
	`1057`	`+try:`
	`1058`	`+wrong_bin_dir=app.make_empty(base_dir=node.base_dir,bin_dir="wrong/path")`
	`1059`	`+wrong_bin_dir.slow_start()`
	`1060`	`+raiseRuntimeError("Error was expected.")# We should not reach this`
	`1061`	`+exceptFileNotFoundError:`
	`1062`	`+pass# Expected error`
	`1063`	`+`
`1047`	`1064`
`1048`	`1065`	`if__name__=='__main__':`
`1049`	`1066`	`ifos.environ.get('ALT_CONFIG'):`

Comments

(0)