formatted aggregation in tests

Author: kelvich

tests2/lib/bank_client.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import psycopg2
 import random
 from multiprocessing import Process, Value, Queue
@@ -32,9 +33,35 @@ def stop(self):
         for client in self._clients:
             client.stop()
 
-    def set_acc_to_tx(self, max_acc):
+    def print_agg(self):
+        aggs = []
         for client in self._clients:
-            client.set_acc_to_tx(max_acc)
+            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):

tests2/test_recovery.py

@@ -26,34 +26,9 @@ def tearDownClass(self):
     def test_0_normal_operation(self):
         print('### normalOpsTest ###')
 
-        self.clients.set_acc_to_tx(10000)
-        self.clients.start()
-
-        for i in range(5):
-            time.sleep(3)
-            for client in self.clients:
-                agg = client.history.aggregate()
-                print(agg)
-                self.assertTrue(agg['transfer']['finish']['Commit'] > 0)
-            print("\n")
-
-        self.clients.stop()
-
-    def test_1_distributed_deadlock(self):
-        print('### DDD test ###')
-
-        self.clients.set_acc_to_tx(10)
-        self.clients.start()
-
-        for i in range(5):
+        for i in range(1000):
             time.sleep(3)
-            for client in self.clients:
-                agg = client.history.aggregate()
-                print(agg)
-                self.assertTrue(agg['transfer']['finish']['Commit'] > 0)
-            print("\n")
-
-        self.clients.stop()
+            self.clients.print_agg()
 
     def test_2_node_disconnect(self):
         print('### disconnectTest ###')