clean up recovery tests

Author: kelvich

tests2/lib/bank_client.py

@@ -40,8 +40,6 @@ def print_agg(self):
 
         columns = ['running', 'running_latency', 'max_latency', 'finish']
 
-        #rows = [ k+str(i+1) for k in agg.keys() for i, agg in enumerate(aggs)]
-
         print("\t\t", end="")
         for col in columns:
             print(col, end="\t")

tests2/test_recovery.py

@@ -39,9 +39,6 @@ def test_2_node_disconnect(self):
         subprocess.check_call(['blockade','partition','node3'])
         print('Node3 disconnected')
 
-        # give cluster some time to discover problem
-        time.sleep(3)
-
         for i in range(5):
             time.sleep(3)
             for client in self.clients:
@@ -53,6 +50,14 @@ def test_2_node_disconnect(self):
         subprocess.check_call(['blockade','join'])
         self.clients.stop()
 
+        subprocess.check_call(['blockade','join'])
+        print("Node3 joined back")
+
+        for i in range(50):
+            time.sleep(3)
+            self.clients.print_agg()
+
+
 if __name__ == '__main__':
     unittest.main()