Commitbd1eb79

committed

Merge branch 'master' into D20250504_003--releasing_of_port

2 parents02f7f00 +0b331e6 commitbd1eb79Copy full SHA for bd1eb79

File tree

+16

-7

lines changed

+16

-7

lines changed

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -883,10 +883,20 @@ def test_backup_wrong_xlog_method(self, node_svc: PostgresNodeService):`
`883`	`883`
`884`	`884`	`deftest_pg_ctl_wait_option(self,node_svc:PostgresNodeService):`
`885`	`885`	`assertisinstance(node_svc,PostgresNodeService)`
`886`		`-C_MAX_ATTEMPTS=50`
	`886`	`+with__class__.helper__get_node(node_svc)asnode:`
	`887`	`+self.impl__test_pg_ctl_wait_option(node_svc,node)`
`887`	`888`
`888`		`-node=__class__.helper__get_node(node_svc)`
	`889`	`+defimpl__test_pg_ctl_wait_option(`
	`890`	`+self,`
	`891`	`+node_svc:PostgresNodeService,`
	`892`	`+node:PostgresNode`
	`893`	`+ )->None:`
	`894`	`+assertisinstance(node_svc,PostgresNodeService)`
	`895`	`+assertisinstance(node,PostgresNode)`
`889`	`896`	`assertnode.status()==NodeStatus.Uninitialized`
	`897`	`+`
	`898`	`+C_MAX_ATTEMPTS=50`
	`899`	`+`
`890`	`900`	`node.init()`
`891`	`901`	`assertnode.status()==NodeStatus.Stopped`
`892`	`902`	`node.start(wait=False)`
`@@ -950,7 +960,6 @@ def test_pg_ctl_wait_option(self, node_svc: PostgresNodeService):`
`950`	`960`	`raiseException("Unexpected node status: {0}.".format(s1))`
`951`	`961`
`952`	`962`	`logging.info("OK. Node is stopped.")`
`953`		`-node.cleanup()`
`954`	`963`
`955`	`964`	`deftest_replicate(self,node_svc:PostgresNodeService):`
`956`	`965`	`assertisinstance(node_svc,PostgresNodeService)`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -341,10 +341,10 @@ def test_simple_with_bin_dir(self):`
`341`	`341`	`bin_dir=node.bin_dir`
`342`	`342`
`343`	`343`	`app=NodeApp()`
`344`		`-correct_bin_dir=app.make_simple(base_dir=node.base_dir,bin_dir=bin_dir)`
`345`		`-correct_bin_dir.slow_start()`
`346`		`-correct_bin_dir.safe_psql("SELECT 1;")`
`347`		`-correct_bin_dir.stop()`
	`344`	`+withapp.make_simple(base_dir=node.base_dir,bin_dir=bin_dir)ascorrect_bin_dir:`
	`345`	`+correct_bin_dir.slow_start()`
	`346`	`+correct_bin_dir.safe_psql("SELECT 1;")`
	`347`	`+correct_bin_dir.stop()`
`348`	`348`
`349`	`349`	`whileTrue:`
`350`	`350`	`try:`

Comments

(0)