commit 3a261d5f415f91a06afe06437b66ed84ff266571
author Rich Lane <rich.lane@bigswitch.com> Thu Jan 03 17:45:08 2013 -0800
committer Rich Lane <rich.lane@bigswitch.com> Thu Jan 03 18:03:45 2013 -0800
tree adedcf0c7e809f7d3f69e56ef966e4704e1b65bd
parent 32bf948a5f640a07c89926fb10ebe4b0d9cb01da

raise an AssertionError if do_barrier fails

This removes a lot of boilerplate code.

tests/FuncUtils.py

diff --git a/tests/FuncUtils.py b/tests/FuncUtils.py
index ad1b1ea..6ff2045 100644
--- a/tests/FuncUtils.py
+++ b/tests/FuncUtils.py
@@ -42,7 +42,7 @@
     msg.actions.add(act)
 
     self.controller.message_send(msg)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_exactflow,match)
 
@@ -69,7 +69,7 @@
     msg.actions.add(act)
 
     self.controller.message_send(msg)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_exactflow,match)         
        
@@ -97,7 +97,7 @@
     msg1.actions.add(act1)
 
     self.controller.message_send(msg1)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_wildcardsrc,match1)
 
@@ -124,7 +124,7 @@
     msg.actions.add(act)
 
     self.controller.message_send(msg)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_MatchSrc,match)
       
@@ -150,7 +150,7 @@
     msg.actions.add(act)
 
     self.controller.message_send(msg)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_matchdst,match)
 
@@ -176,7 +176,7 @@
         msg2.priority = priority
 
     self.controller.message_send(msg2)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_wildcard,match2)
 
@@ -209,7 +209,7 @@
         msg3.priority = priority
 
     self.controller.message_send(msg3)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_matchingress,match3)
 
@@ -241,7 +241,7 @@
         msg3.priority = priority
 
     self.controller.message_send(msg3)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_matchingress,match3)
 
@@ -268,7 +268,7 @@
     msg.actions.add(act)
 
     self.controller.message_send(msg)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_matchvlanid,match)
 
@@ -294,7 +294,7 @@
     msg.actions.add(act)
 
     self.controller.message_send(msg)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_matchvlanpcp,match)
 
@@ -321,7 +321,7 @@
     msg.actions.add(act)
 
     self.controller.message_send(msg)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_mulL2,match)
 
@@ -347,7 +347,7 @@
     msg.actions.add(act)
 
     self.controller.message_send(msg)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_mulL4,match)  
 
@@ -372,7 +372,7 @@
     msg.actions.add(act)
 
     self.controller.message_send(msg)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_iptos,match)
 
@@ -397,7 +397,7 @@
     msg.actions.add(act)
 
     self.controller.message_send(msg)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_iptos,match)
 
@@ -424,7 +424,7 @@
     msg.actions.add(act)
 
     self.controller.message_send(msg)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_matchtSrc,match)  
 
@@ -449,7 +449,7 @@
     msg.actions.add(act)
 
     self.controller.message_send(msg)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
     return (pkt_matchdst,match)        
 
@@ -476,7 +476,7 @@
     msg.actions.add(act)
 
     self.controller.message_send(msg)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
     return (pkt_matchtype,match)
 
    
@@ -500,7 +500,7 @@
 
     # Send the flow with action A'
     self.controller.message_send (msg5)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
 def modify_flow_action(self,of_ports,match,priority=None):
 # Modify the flow action
@@ -522,7 +522,7 @@
 
     # Send the flow with action A'
     self.controller.message_send (msg8)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
 def enqueue(self,ingress_port,egress_port,egress_queue_id):
 #Generate a flow with enqueue action i.e output to a queue configured on a egress_port
@@ -544,7 +544,7 @@
     
     logging.info("Inserting flow")
     self.controller.message_send(request)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
     return (pkt,match)
 
 
@@ -815,7 +815,7 @@
     if priority != None :
         msg4.priority = priority
     self.controller.message_send(msg4)
-    self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+    do_barrier(self.controller)
 
 
 
@@ -833,7 +833,7 @@
         msg6.priority = priority
 
     self.controller.message_send(msg6)
-    self.assertEqual(do_barrier(self.controller),0, "Barrier failed")
+    do_barrier(self.controller)
 
 
 ###########################################################################################################################################################