formatted aggregation in tests

kelvich · kelvich · commit 4848fad109a0 · 2016-07-04T19:51:49.000+03:00
diff --git a/contrib/mmts/tests2/lib/bank_client.py b/contrib/mmts/tests2/lib/bank_client.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 import psycopg2
 import random
 from multiprocessing import Process, Value, Queue
@@ -30,6 +31,36 @@ def stop(self):
         for client in self._clients:
             client.stop()
 
+    def print_agg(self):
+        aggs = []
+        for client in self._clients:
+            aggs.append(client.history.aggregate())
+
+        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")
+        print("\n", end="")
+
+        for i, agg in enumerate(aggs):
+            for k in agg.keys():
+                print("%s_%d:\t" % (k, i+1), end="")
+                for col in columns:
+                    if k in agg and col in agg[k]:
+                        if isinstance(agg[k][col], float):
+                            print("%.2f\t" % (agg[k][col],), end="\t")
+                            #print(agg[k][col], end="\t")
+                        else :
+                            print(agg[k][col], end="\t")
+                    else :
+                        print("-\t", end='')
+                print("\n", end='')
+
+        print("")
+
 
 class BankClient(object):
 
diff --git a/contrib/mmts/tests2/test_recovery.py b/contrib/mmts/tests2/test_recovery.py
@@ -35,25 +35,9 @@ def test_1_node_disconnect(self):
         subprocess.check_call(['blockade','partition','node3'])
         print('Node3 disconnected')
 
-        print('Waiting 15s to discover failure')
-
-        for i in range(5):
-            time.sleep(3)
-            for client in self.clients:
-                agg = client.history.aggregate()
-                print(agg)
-            print(" ")
-
-        # subprocess.check_call(['blockade','join'])
-
-        print('Waiting 15s to join node')
         for i in range(1000):
             time.sleep(3)
-            for client in self.clients:
-                agg = client.history.aggregate()
-                print(agg)
-            print(" ")
-
+            self.clients.print_agg()
 
 if __name__ == '__main__':
     unittest.main()
