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

diff --git a/tests/flow_stats.py b/tests/flow_stats.py
index a96bb45..8f59ccc 100644
--- a/tests/flow_stats.py
+++ b/tests/flow_stats.py
@@ -148,7 +148,7 @@
         # send flow
         logging.info("Inserting flow")
         self.controller.message_send(flow_mod_msg)
-        self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+        do_barrier(self.controller)
 
         # no packets sent, so zero packet count
         self.verifyStats(flow_mod_msg, match, ofp.OFPP_NONE, test_timeout, 0)
@@ -270,7 +270,7 @@
         self.controller.message_send(flow_mod_msg1)
         logging.info("Inserting flow2")
         self.controller.message_send(flow_mod_msg2)
-        self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+        do_barrier(self.controller)
 
         num_pkt1s = random.randint(10,30)
         logging.info("Sending " + str(num_pkt1s) + " pkt1s")
@@ -381,7 +381,7 @@
         self.controller.message_send(flow_mod_msg1)
         logging.info("Inserting flow2")
         self.controller.message_send(flow_mod_msg2)
-        self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+        do_barrier(self.controller)
 
         num_pkt1s = random.randint(10,30)
         logging.info("Sending " + str(num_pkt1s) + " pkt1s")
@@ -498,7 +498,7 @@
         # send flow
         logging.info("Inserting flow")
         self.controller.message_send(flow_mod_msg)
-        self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+        do_barrier(self.controller)
 
         # send packet N times
         num_sends = random.randint(10,20)