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/caps.py b/tests/caps.py
index 6c48840..9f80d4b 100644
--- a/tests/caps.py
+++ b/tests/caps.py
@@ -58,8 +58,7 @@
# Make sure we can install at least one flow
logging.info("Inserting initial flow")
- rv = obj.controller.message_send(request)
- obj.assertTrue(rv != -1, "Error installing flow mod")
+ obj.controller.message_send(request)
obj.assertEqual(do_barrier(obj.controller, timeout=10), 0, "Barrier failed")
flow_count = 1
@@ -68,7 +67,7 @@
while True:
request.match.nw_src += 1
- rv = obj.controller.message_send(request)
+ obj.controller.message_send(request)
flow_count += 1
if flow_count % count_check == 0:
obj.assertEqual(do_barrier(obj.controller, timeout=10), 0, "Barrier failed")