infinite test

kelvich · kelvich · commit 90585ee924c0 · 2016-07-05T17:53:46.000+03:00
diff --git a/contrib/mmts/tests2/lib/event_history.py b/contrib/mmts/tests2/lib/event_history.py
@@ -65,10 +65,6 @@ def aggregate(self):
 
         agg = {}
         for ev in self.events:
-            if ev['finished_at'] < self.last_aggregation:
-                #print("cont")
-                continue
-
             if ev['name'] not in agg:
                 agg[ev['name']] = copy.deepcopy(self.agg_template)
                 #print('-=-=-', agg)
@@ -84,6 +80,8 @@ def aggregate(self):
             if named_agg['max_latency'] < latency:
                 named_agg['max_latency'] = latency
 
+        self.events = []
+
         for value in self.running_events.itervalues():
 
             if value['name'] not in agg:
@@ -96,8 +94,6 @@ def aggregate(self):
             if named_agg['running_latency'] < latency:
                 named_agg['running_latency'] = latency
 
-        self.last_aggregation = datetime.datetime.now()
-        #print("aggregeted!")
         return agg
 
     def aggregate_by(self, period):
diff --git a/contrib/mmts/tests2/test_recovery.py b/contrib/mmts/tests2/test_recovery.py
@@ -22,61 +22,78 @@ def tearDownClass(self):
         self.clients.stop()
         #self.clients[0].cleanup()
 
-
-    def test_0_normal_operation(self):
+    def test_0_0_0(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 ###')
+        time.sleep(10)
+        subprocess.check_call(['blockade','partition','node3'])
 
-        self.clients.set_acc_to_tx(10)
+        self.clients.set_acc_to_tx(10000)
         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)
+            self.clients.print_agg()
             print("\n")
 
         self.clients.stop()
 
-    def test_2_node_disconnect(self):
-        print('### disconnectTest ###')
-
-        self.clients.set_acc_to_tx(10000)
-        self.clients.start()
-
-        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:
-                agg = client.history.aggregate()
-                print(agg)
-                self.assertTrue(agg['transfer']['finish']['Commit'] > 0)
-            print("\n")
-
-        subprocess.check_call(['blockade','join'])
-        self.clients.stop()
+#    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):
+#            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_2_node_disconnect(self):
+#        print('### disconnectTest ###')
+#
+#        self.clients.set_acc_to_tx(10000)
+#        self.clients.start()
+#
+#        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:
+#                agg = client.history.aggregate()
+#                print(agg)
+#                self.assertTrue(agg['transfer']['finish']['Commit'] > 0)
+#            print("\n")
+#
+#        subprocess.check_call(['blockade','join'])
+#        self.clients.stop()
 
 if __name__ == '__main__':
     unittest.main()
