commit 0fc08bddeee38f13c2f9125b78fab44dff803d0d
author Dan Talayco <dan.talayco@bigswitch.com> Mon Apr 09 16:56:18 2012 -0700
committer Dan Talayco <dan.talayco@bigswitch.com> Mon Apr 09 16:56:18 2012 -0700
tree 57b5beccbd6bff294cb87eed744a421194da2886
parent 488fbc52b4986db4d69f881209391f2321393af2

Add default timeout for do_barrier

And check the result do_barrier in all calls.

tests/caps.py

diff --git a/tests/caps.py b/tests/caps.py
index bb85818..4a0e355 100644
--- a/tests/caps.py
+++ b/tests/caps.py
@@ -90,7 +90,7 @@
     caps_logger.info("Inserting initial flow")
     rv = obj.controller.message_send(request)
     obj.assertTrue(rv != -1, "Error installing flow mod")
-    do_barrier(obj.controller)
+    self.assertEqual(do_barrier(obj.controller), 0, "Barrier failed")
     flow_count = 1
 
     caps_logger.info("Table idx: " + str(table_idx))
@@ -99,7 +99,7 @@
     while True:
         request.match.nw_src += 1
         rv = obj.controller.message_send(request)
-        do_barrier(obj.controller)
+        self.assertEqual(do_barrier(obj.controller), 0, "Barrier failed")
         flow_count += 1
         if flow_count % count_check == 0:
             response, pkt = obj.controller.transact(tstats, timeout=2)