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.
diff --git a/tests/openflow_protocol_messages.py b/tests/openflow_protocol_messages.py
index 2d57978..037209d 100644
--- a/tests/openflow_protocol_messages.py
+++ b/tests/openflow_protocol_messages.py
@@ -43,8 +43,7 @@
logging.info("Expecting Features_Reply")
request = message.features_request()
- rv = self.controller.message_send(request)
- self.assertTrue(rv != -1, "Not able to send features request.")
+ self.controller.message_send(request)
(response, pkt) = self.controller.poll(exp_msg=ofp.OFPT_FEATURES_REPLY,
timeout=2)
@@ -73,8 +72,7 @@
logging.info("Expecting OFPT_GET_CONFIG_REPLY ")
request = message.get_config_request()
- rv = self.controller.message_send(request)
- self.assertTrue(rv != -1, " Not able to send get_config request.")
+ self.controller.message_send(request)
(response, pkt) = self.controller.poll(exp_msg=ofp.OFPT_GET_CONFIG_REPLY,
timeout=2)
@@ -235,8 +233,7 @@
msg.actions.add(act)
logging.info("PacketOut to: " + str(dp_port))
- rv = self.controller.message_send(msg)
- self.assertTrue(rv == 0, "Error sending out message")
+ self.controller.message_send(msg)
exp_pkt_arg = None
exp_port = None