commit 5c3151c308aec2178ec516ae074f07a4fb18a619
author Rich Lane <rich.lane@bigswitch.com> Thu Jan 03 17:15:41 2013 -0800
committer Rich Lane <rich.lane@bigswitch.com> Thu Jan 03 18:03:45 2013 -0800
tree d5236bb64ae0a77f1954779467683a0ecbd5198c
parent e30455b947669e3dd9adc9f2e591a0c5f3b97d7f

throw AssertionError if controller.message_send fails

Unlike other types of exception an AssertionError will cause the test to "fail"
instead of "error". Using an exception instead of checking return values
removes a lot of boilerplate code that wasn't always present (or correct). It
may also help disabuse test writers of the dangerous notion that succeeding in
writing a message to the TCP socket means anything.

tests/detailed_contr_sw_messages.py

diff --git a/tests/detailed_contr_sw_messages.py b/tests/detailed_contr_sw_messages.py
index 25fc683..3ca0038 100644
--- a/tests/detailed_contr_sw_messages.py
+++ b/tests/detailed_contr_sw_messages.py
@@ -65,9 +65,7 @@
         act3 = action.action_output()
         act3.port = of_ports[1]
         msg3.actions.add(act3)
-        msg3.actions.add(1)
-        rv = self.controller.message_send(msg3)
-        self.assertTrue(rv != -1, "Error installing flow mod")
+        self.controller.message_send(msg3)
         self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
 
         # Verify Flow does not get inserted 
@@ -193,8 +191,7 @@
         
         request.actions.add(act)
         logging.info("Inserting flow")
-        rv = self.controller.message_send(request)
-        self.assertTrue(rv != -1, "Flow addition did not fail.")
+        self.controller.message_send(request)
 
         self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
 
@@ -241,8 +238,7 @@
         request.actions.add(act3)
 
         logging.info("Inserting flow")
-        rv = self.controller.message_send(request)
-        self.assertTrue(rv != -1, "Error installing flow mod")
+        self.controller.message_send(request)
         self.assertEqual(do_barrier(self.controller), 0, "Barrier failed") 
 
         #Verify the flow gets added i.e. active_count= 1
@@ -457,8 +453,7 @@
         act.port = of_ports[1]
         request.actions.add(act)
 
-        rv = self.controller.message_send(request)
-        self.assertTrue(rv != -1, "Flow addition failed.")
+        self.controller.message_send(request)
         
         # Delete the emergency flow
         
@@ -590,8 +585,7 @@
         msg7.buffer_id = 0xffffffff
         msg7.match = match
 
-        rv = self.controller.message_send(msg7)
-        self.assertTrue(rv != -1, "Error installing flow mod")
+        self.controller.message_send(msg7)
         self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
 
         # Verify flow will not get deleted, active_entries in table_stats_request = 1
@@ -607,8 +601,7 @@
         msg7.buffer_id = 0xffffffff
         msg7.match = match
 
-        rv = self.controller.message_send(msg7)
-        self.assertTrue(rv != -1, "Error installing flow mod")
+        self.controller.message_send(msg7)
         self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
         
         #Verify flow gets deleted.
@@ -783,8 +776,7 @@
         act3.port = of_ports[1]
         msg3.actions.add(act3)
 
-        rv = self.controller.message_send(msg3)
-        self.assertTrue(rv != -1, "Error installing flow mod")
+        self.controller.message_send(msg3)
         self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
 
         #Verify no flow removed message is generated