NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitf40b220

committed

small cleanup#6

1 parent6ba3da3 commitf40b220Copy full SHA for f40b220

File tree

3 files changed

-34

lines changed

tests2
- lib
  - bank_client.py
  - event_history.py
- test_recovery.py

3 files changed

-34

lines changed

`‎tests2/lib/bank_client.py`

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ def __init__(self, connstrs):`
`11`	`11`	`forcsinconnstrs:`
`12`	`12`	`b=BankClient(cs)`
`13`	`13`	`self._clients.append(b)`
`14`		`-# glob_clients.append(b)`
`15`	`14`
`16`	`15`	`self._clients[0].initialize()`
`17`	`16`
`@@ -29,7 +28,6 @@ def start(self):`
`29`	`28`	`defstop(self):`
`30`	`29`	`forclientinself._clients:`
`31`	`30`	`client.stop()`
`32`		`-# client.cleanup()`
`33`	`31`
`34`	`32`
`35`	`33`	`classBankClient(object):`
`@@ -41,7 +39,6 @@ def __init__(self, connstr):`
`41`	`39`	`self.accounts=10000`
`42`	`40`
`43`	`41`	`definitialize(self):`
`44`		`-# initialize database`
`45`	`42`	`conn=psycopg2.connect(self.connstr)`
`46`	`43`	`cur=conn.cursor()`
`47`	`44`	`cur.execute('create extension if not exists multimaster')`
`@@ -69,7 +66,7 @@ def check_total(self):`
`69`	`66`	`res=cur.fetchone()`
`70`	`67`	`ifres[0]!=0:`
`71`	`68`	`print("Isolation error, total = %d"% (res[0],))`
`72`		`-raiseBaseException#`
	`69`	`+raiseBaseException`
`73`	`70`
`74`	`71`	`cur.close()`
`75`	`72`	`conn.close()`
`@@ -88,7 +85,6 @@ def transfer_money(self):`
`88`	`85`
`89`	`86`	`event_id=self.history.register_start('tx')`
`90`	`87`
`91`		`-#cur.execute('begin')`
`92`	`88`	`cur.execute('''update bank_test`
`93`	`89`	`set amount = amount - %s`
`94`	`90`	`where uid = %s''',`
`@@ -97,7 +93,6 @@ def transfer_money(self):`
`97`	`93`	`set amount = amount + %s`
`98`	`94`	`where uid = %s''',`
`99`	`95`	`(amount,to_uid))`
`100`		`-#cur.execute('commit')`
`101`	`96`
`102`	`97`	`try:`
`103`	`98`	`conn.commit()`
`@@ -106,8 +101,6 @@ def transfer_money(self):`
`106`	`101`	`else:`
`107`	`102`	`self.history.register_finish(event_id,'commit')`
`108`	`103`
`109`		`-#print("T", i)`
`110`		`-`
`111`	`104`	`cur.close()`
`112`	`105`	`conn.close()`
`113`	`106`
`@@ -131,8 +124,6 @@ def start(self):`
`131`	`124`
`132`	`125`	`defstop(self):`
`133`	`126`	`self.run.value=False`
`134`		`-# self.total_process.join()`
`135`		`-# self.transfer_process.join()`
`136`	`127`	`return`
`137`	`128`
`138`	`129`	`defcleanup(self):`

`‎tests2/lib/event_history.py`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ def aggregate(self):`
`78`	`78`	`named_agg['running']=1`
`79`	`79`	`named_agg['running_latency']=latency`
`80`	`80`
`81`		`-# print(self.running_events)`
`82`	`81`	`returnagg`
`83`	`82`
`84`	`83`	`defaggregate_by(self,period):`

`‎tests2/test_recovery.py`

Lines changed: 1 addition & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`importtime`
`3`	`3`	`importsubprocess`
`4`	`4`	`fromlib.bank_clientimport*`
`5`		`-#from lib.bank_client import *`
`6`	`5`
`7`	`6`
`8`	`7`	`classRecoveryTest(unittest.TestCase):`
`@@ -35,33 +34,12 @@ def test_1_node_disconnect(self):`
`35`	`34`
`36`	`35`	`subprocess.check_call(['blockade','partition','node3'])`
`37`	`36`	`print('---node3 out---')`
`38`		`-`
`39`		`-time.sleep(25)`
`40`		`-`
`41`		`-# node1 should work`
`42`		`-agg=self.clients[0].history.aggregate()`
`43`		`-print(agg)`
`44`		`-# self.assertTrue(agg['tx']['commit'] > 0)`
`45`		`-`
`46`		`-# node3 shouldn't work`
`47`		`-agg=self.clients[2].history.aggregate()`
`48`		`-print(agg)`
`49`		`-# self.assertTrue(agg['tx']['commit'] == 0)`
`50`		`-`
`51`		`-# subprocess.check_call(['blockade','partition','node2'])`
`52`		`-# print('---node2 out---')`
`53`		`-# time.sleep(5)`
	`37`	`+time.sleep(15)`
`54`	`38`
`55`	`39`	`subprocess.check_call(['blockade','join'])`
`56`	`40`	`print('---node2 and node3 are back---')`
`57`	`41`	`time.sleep(5)`
`58`	`42`
`59`		`-#b1_agg = self.b1.history().aggregate()`
`60`		`-#self.assertTrue(b1_agg['commit']['count'] > 0)`
`61`		`-#self.assertTrue(`
`62`		`-# float(b1_agg['rollback']['count'])/b1_agg['commit']['count'] < 0.2`
`63`		`-#)`
`64`		`-`
`65`	`43`	`if__name__=='__main__':`
`66`	`44`	`unittest.main()`
`67`	`45`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf40b220

File tree

3 files changed

3 files changed

`‎tests2/lib/bank_client.py`

`‎tests2/lib/event_history.py`

`‎tests2/test_recovery.py`

0 commit comments