raftable tests

kelvich · kelvich · commit 9d26b3c23dff · 2017-11-13T00:17:04.000+03:00
diff --git a/tests2/lib/bank_client.py b/tests2/lib/bank_client.py
@@ -9,8 +9,8 @@ class ClientCollection(object):
     def __init__(self, connstrs):
         self._clients = []
 
-        for cs in connstrs:
-            b = BankClient(cs)
+        for i, cs in enumerate(connstrs):
+            b = BankClient(cs, i)
             self._clients.append(b)
 
         self._clients[0].initialize()
@@ -27,17 +27,21 @@ def start(self):
             client.start()
 
     def stop(self):
+        print('collection stop called', self._clients)
         for client in self._clients:
+            print('stop coll')
             client.stop()
 
 
 class BankClient(object):
 
-    def __init__(self, connstr):
+    def __init__(self, connstr, node_id):
         self.connstr = connstr
+        self.node_id = node_id
         self.run = Value('b', True)
         self._history = EventHistory()
         self.accounts = 10000
+        self.show_errors = True
 
     def initialize(self):
         conn = psycopg2.connect(self.connstr)
@@ -59,6 +63,10 @@ def initialize(self):
     def history(self):
         return self._history
 
+    def print_error(self, arg, comment=''):
+        if self.show_errors:
+            print('Node', self.node_id, 'got error', arg, comment)
+
     def check_total(self):
         conn, cur = self.connect()
 
@@ -72,16 +80,13 @@ def check_total(self):
                     print("Isolation error, total = %d" % (res[0],))
                     raise BaseException
             except psycopg2.InterfaceError:
-                print("Got error: ", sys.exc_info())
-                print("Reconnecting")
                 conn, cur = self.connect(reconnect=True)
             except:
-                print("Got error: ", sys.exc_info())
+                self.print_error(sys.exc_info(),'3')
                 self.history.register_finish(event_id, 'rollback')
             else:
                 self.history.register_finish(event_id, 'commit')
 
-
         cur.close()
         conn.close()
 
@@ -110,14 +115,10 @@ def transfer_money(self):
                     (amount, to_uid))
 
                 conn.commit()
-            except psycopg2.DatabaseError:
-                print("Got error: ", sys.exc_info())
-                print("Reconnecting")
-                
-                self.history.register_finish(event_id, 'rollback')
+            except psycopg2.InterfaceError:
                 conn, cur = self.connect(reconnect=True)
             except:
-                print("Got error: ", sys.exc_info())
+                self.print_error(sys.exc_info(),'1')
                 self.history.register_finish(event_id, 'rollback')
             else:
                 self.history.register_finish(event_id, 'commit')
@@ -127,16 +128,17 @@ def transfer_money(self):
 
     def connect(self, reconnect=False):
         
-        while self.run.value:
+        while True:
             try:
                 conn = psycopg2.connect(self.connstr)
                 cur = conn.cursor()
+                return conn, cur
             except:
-                print("Got error: ", sys.exc_info())
+                self.print_error(sys.exc_info(),'2')
                 if not reconnect:
                     raise
-            else:
-                return conn, cur
+                if not self.run.value:
+                    raise
 
     # def watchdog(self):
     #    while self.run.value:
@@ -156,7 +158,10 @@ def start(self):
         return
 
     def stop(self):
+        print('Stopping!');
         self.run.value = False
+        self.total_process.join()
+        self.transfer_process.join()
         return
 
     def cleanup(self):
diff --git a/tests2/test_recovery.py b/tests2/test_recovery.py
@@ -15,6 +15,7 @@ def setUp(self):
         self.clients.start()
 
     def tearDown(self):
+        print('tearDown')
         self.clients.stop()
         self.clients[0].cleanup()
         subprocess.check_call(['blockade','join'])
