Commitc696004

committed

fixes in code & tests

1 parente10520a commitc696004Copy full SHA for c696004

File tree

+13

-5

lines changed

+13

-5

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,5 +59,10 @@ def call_initdb(initdb_dir, log=None):`
`59`	`59`	`# XXX: build new WAL segment with our system id`
`60`	`60`	`_params= [get_bin_path("pg_resetwal"),"-D",data_dir,"-f"]`
`61`	`61`	`execute_utility(_params,logfile)`
	`62`	`+`
	`63`	`+exceptExecUtilExceptionase:`
	`64`	`+msg="Failed to reset WAL for system id"`
	`65`	`+raise_from(InitNodeException(msg),e)`
	`66`	`+`
`62`	`67`	`exceptExceptionase:`
`63`	`68`	`raise_from(InitNodeException("Failed to spawn a node"),e)`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,11 @@ def generate_system_id():`
`76`	`76`	`importdatetime`
`77`	`77`	`importstruct`
`78`	`78`
`79`		`-date=datetime.datetime.now()`
`80`		`-secs=int(date.timestamp())`
`81`		`-usecs=date.microsecond`
	`79`	`+date1=datetime.datetime.utcfromtimestamp(0)`
	`80`	`+date2=datetime.datetime.utcnow()`
	`81`	`+`
	`82`	`+secs=int((date2-date1).total_seconds())`
	`83`	`+usecs=date2.microsecond`
`82`	`84`
`83`	`85`	`system_id=0`
`84`	`86`	`system_id\|= (secs<<32)`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`fromtestgres.utilsimportpg_version_ge`
`42`	`42`
`43`	`43`
`44`		`-defutil_is_executable(util):`
	`44`	`+defutil_exists(util):`
`45`	`45`	`defgood_properties(f):`
`46`	`46`	`# yapf: disable`
`47`	`47`	`return (os.path.exists(f)and`
`@@ -91,6 +91,7 @@ def test_init_after_cleanup(self):`
`91`	`91`	`node.cleanup()`
`92`	`92`	`node.init().start().execute('select 1')`
`93`	`93`
	`94`	`+@unittest.skipUnless(util_exists('pg_resetwal'),'might be missing')`
`94`	`95`	`@unittest.skipUnless(pg_version_ge('9.6'),'query works on 9.6+')`
`95`	`96`	`deftest_init_unique_system_id(self):`
`96`	`97`	`withscoped_config(`
`@@ -507,7 +508,7 @@ def test_logging(self):`
`507`	`508`	`master.restart()`
`508`	`509`	`self.assertTrue(master._logger.is_alive())`
`509`	`510`
`510`		`-@unittest.skipUnless(util_is_executable('pgbench'),'might be missing')`
	`511`	`+@unittest.skipUnless(util_exists('pgbench'),'might be missing')`
`511`	`512`	`deftest_pgbench(self):`
`512`	`513`	`withget_new_node().init().start()asnode:`
`513`	`514`

Comments

(0)