Commit73df8e9

committed

check data identity in tests

1 parentd0265c0 commit73df8e9Copy full SHA for 73df8e9

File tree

+28

-6

lines changed

+28

-6

lines changed

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,24 @@ def initdb(self):`
`109`	`109`	`cur.close()`
`110`	`110`	`conn.close()`
`111`	`111`
	`112`	`+defis_data_identic(self):`
	`113`	`+hashes=set()`
	`114`	`+`
	`115`	`+fordsninself.dsns:`
	`116`	`+con=psycopg2.connect(dsn)`
	`117`	`+cur=con.cursor()`
	`118`	`+cur.execute("""`
	`119`	`+ select`
	`120`	`+ md5('(' \|\| string_agg(uid::text \|\| ', ' \|\| amount::text , '),(') \|\| ')')`
	`121`	`+ from`
	`122`	`+ (select * from bank_test order by uid) t;""")`
	`123`	`+hashes.add(cur.fetchone()[0])`
	`124`	`+cur.close()`
	`125`	`+con.close()`
	`126`	`+`
	`127`	`+print(hashes)`
	`128`	`+return (len(hashes)==1)`
	`129`	`+`
`112`	`130`	`@asyncio.coroutine`
`113`	`131`	`defstatus(self):`
`114`	`132`	`whileself.running:`
`@@ -168,7 +186,7 @@ def exec_tx(self, tx_block, aggname_prefix, conn_i):`
`168`	`186`	`yieldfromasyncio.sleep(0.01)`
`169`	`187`	`exceptBaseExceptionase:`
`170`	`188`	`agg.finish_tx(str(e).strip())`
`171`		`-print('Catch exception ',e)`
	`189`	`+print('Catch exception ',str(e).strip())`
`172`	`190`	`# Give evloop some free time.`
`173`	`191`	`# In case of continuous excetions we can loop here without returning`
`174`	`192`	`# back to event loop and block it`

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ def performFailure(self, failure):`
`68`	`68`	`classRecoveryTest(unittest.TestCase,TestHelper):`
`69`	`69`
`70`	`70`	`@classmethod`
`71`		`-defsetUpClass(self):`
	`71`	`+defsetUpClass(cls):`
`72`	`72`	`subprocess.check_call(['docker-compose','up',`
`73`	`73`	`'--force-recreate',`
`74`	`74`	`'--build',`
`@@ -77,17 +77,21 @@ def setUpClass(self):`
`77`	`77`	`# XXX: add normal wait here`
`78`	`78`	`time.sleep(TEST_SETUP_TIME)`
`79`	`79`
`80`		`-self.client=MtmClient([`
	`80`	`+cls.client=MtmClient([`
`81`	`81`	`"dbname=regression user=postgres host=127.0.0.1 port=15432",`
`82`	`82`	`"dbname=regression user=postgres host=127.0.0.1 port=15433",`
`83`	`83`	`"dbname=regression user=postgres host=127.0.0.1 port=15434"`
`84`	`84`	`],n_accounts=1000)`
`85`		`-self.client.bgrun()`
	`85`	`+cls.client.bgrun()`
`86`	`86`
`87`	`87`	`@classmethod`
`88`		`-deftearDownClass(self):`
	`88`	`+deftearDownClass(cls):`
`89`	`89`	`print('tearDown')`
`90`		`-self.client.stop()`
	`90`	`+cls.client.stop()`
	`91`	`+`
	`92`	`+ifnotcls.client.is_data_identic():`
	`93`	`+raiseAssertionError('Different data on nodes')`
	`94`	`+`
`91`	`95`	`# XXX: check nodes data identity here`
`92`	`96`	`# subprocess.check_call(['docker-compose','down'])`
`93`	`97`

Comments

(0)