small cleanup #6

Author: kelvich

contrib/mmts/tests2/lib/bank_client.py

@@ -11,7 +11,6 @@ def __init__(self, connstrs):
         for cs in connstrs:
             b = BankClient(cs)
             self._clients.append(b)
-            # glob_clients.append(b)
 
         self._clients[0].initialize()
 
@@ -29,7 +28,6 @@ def start(self):
     def stop(self):
         for client in self._clients:
             client.stop()
-#            client.cleanup()
 
 
 class BankClient(object):
@@ -41,7 +39,6 @@ def __init__(self, connstr):
         self.accounts = 10000
 
     def initialize(self):
-        # initialize database
         conn = psycopg2.connect(self.connstr)
         cur = conn.cursor()
         cur.execute('create extension if not exists multimaster')
@@ -69,7 +66,7 @@ def check_total(self):
             res = cur.fetchone()
             if res[0] != 0:
                 print("Isolation error, total = %d" % (res[0],))
-                raise BaseException #
+                raise BaseException
 
         cur.close()
         conn.close()
@@ -88,7 +85,6 @@ def transfer_money(self):
 
             event_id = self.history.register_start('tx')
 
-            #cur.execute('begin')
             cur.execute('''update bank_test
                     set amount = amount - %s
                     where uid = %s''',
@@ -97,7 +93,6 @@ def transfer_money(self):
                     set amount = amount + %s
                     where uid = %s''',
                     (amount, to_uid))
-            #cur.execute('commit')
 
             try:
                 conn.commit()
@@ -106,8 +101,6 @@ def transfer_money(self):
             else:
                 self.history.register_finish(event_id, 'commit')
 
-            #print("T", i)
-
         cur.close()
         conn.close()
 
@@ -131,8 +124,6 @@ def start(self):
 
     def stop(self):
         self.run.value = False
-#        self.total_process.join()
-#        self.transfer_process.join()
         return
 
     def cleanup(self):

contrib/mmts/tests2/lib/event_history.py

@@ -78,7 +78,6 @@ def aggregate(self):
                 named_agg['running'] = 1
                 named_agg['running_latency'] = latency
 
-#        print(self.running_events)
         return agg
 
     def aggregate_by(self, period):

contrib/mmts/tests2/test_recovery.py

@@ -2,7 +2,6 @@
 import time
 import subprocess
 from lib.bank_client import *
-#from lib.bank_client import *
 
 
 class RecoveryTest(unittest.TestCase):
@@ -35,33 +34,12 @@ def test_1_node_disconnect(self):
 
         subprocess.check_call(['blockade','partition','node3'])
         print('---node3 out---')
-        
-        time.sleep(25)
-
-        # node1 should work
-        agg = self.clients[0].history.aggregate()
-        print(agg)
-#        self.assertTrue(agg['tx']['commit'] > 0)
-
-        # node3 shouldn't work
-        agg = self.clients[2].history.aggregate()
-        print(agg)
-#        self.assertTrue(agg['tx']['commit'] == 0)
-
-#        subprocess.check_call(['blockade','partition','node2'])
-#        print('---node2 out---')
-#        time.sleep(5)
+        time.sleep(15)
 
         subprocess.check_call(['blockade','join'])
         print('---node2 and node3 are back---')
         time.sleep(5)
 
-        #b1_agg = self.b1.history().aggregate()
-        #self.assertTrue(b1_agg['commit']['count'] > 0)
-        #self.assertTrue(
-        #    float(b1_agg['rollback']['count'])/b1_agg['commit']['count'] < 0.2
-        #)
-
 if __name__ == '__main__':
     unittest.main()