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

diff --git a/tests/flow_expire.py b/tests/flow_expire.py
index 53d7181..1d05b6b 100644
--- a/tests/flow_expire.py
+++ b/tests/flow_expire.py
@@ -97,7 +97,7 @@
         fe_logger.info("Inserting flow")
         rv = self.controller.message_send(request)
         self.assertTrue(rv != -1, "Error installing flow mod")
-        do_barrier(self.controller)
+        self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
 
         (response, pkt) = self.controller.poll(exp_msg=ofp.OFPT_FLOW_REMOVED,
                                                timeout=test_timeout)