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/actions.py

diff --git a/tests/actions.py b/tests/actions.py
index 7a3df4e..8be69dc 100644
--- a/tests/actions.py
+++ b/tests/actions.py
@@ -57,7 +57,7 @@
         msg.buffer_id = 0xffffffff
         msg.match = match
         self.controller.message_send(msg)
-        self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+        do_barrier(self.controller)
 
         #Sending N packets matching the flow inserted
         for pkt_cnt in range(5):
@@ -160,7 +160,7 @@
         
         logging.info("Inserting flow")
         self.controller.message_send(request)
-        self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+        do_barrier(self.controller)
 
         #Send Packet matching the flow
         logging.info("Sending packet to dp port " + str(ingress_port))
@@ -211,7 +211,7 @@
 
             logging.info("Inserting flow")
             self.controller.message_send(request)
-            self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+            do_barrier(self.controller)
             
             #Send packet matching the flow
             logging.info("Sending packet to dp port " + str(ingress_port))
@@ -262,7 +262,7 @@
 
             logging.info("Inserting flow")
             self.controller.message_send(request)
-            self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+            do_barrier(self.controller)
 
             #Send packet matching the flow
             logging.info("Sending packet to dp port " + str(ingress_port))
@@ -311,7 +311,7 @@
         
         logging.info("Inserting flow")
         self.controller.message_send(request)
-        self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+        do_barrier(self.controller)
 
         #Send Packet matching the flow
         logging.info("Sending packet to dp port " + str(ingress_port))
@@ -360,7 +360,7 @@
         request.actions.add(act)
         logging.info("Inserting flow")
         self.controller.message_send(request)
-        self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+        do_barrier(self.controller)
 
         #Send packet matching the flow
         logging.info("Sending packet to dp port " + str(ingress_port))