Merge into master from pull request #165:
Use a short timeout when polling for packets. (https://github.com/floodlight/oftest/pull/165)
diff --git a/src/python/oftest/testutils.py b/src/python/oftest/testutils.py
index 85ccfc3..c3b2f33 100644
--- a/src/python/oftest/testutils.py
+++ b/src/python/oftest/testutils.py
@@ -587,7 +587,7 @@
for ofport in yes_ports:
logging.debug("Checking for pkt on port " + str(ofport))
(rcv_port, rcv_pkt, pkt_time) = dp.poll(
- port_number=ofport, exp_pkt=exp_pkt_arg)
+ port_number=ofport, timeout=1, exp_pkt=exp_pkt_arg)
assert_if.assertTrue(rcv_pkt is not None,
"Did not receive pkt on " + str(ofport))
if not oftest.dataplane.match_exp_pkt(pkt, rcv_pkt):