At the end of the NetFlow unit tests we warp time to force any
remaining flows to expire and then immediately kill OVS and the
collector. However, this creates a race where sometimes these
processes are killed before the last records are sent or collected.
It's possible to force OVS to go through the run loop one last time
before exiting but it's harder to enforce that the collector receives
the packet. This simply avoids the problem by adding a 1 second delay
before killing the processes, which should be more than enough time.
Signed-off-by: Jesse Gross <je...@nicira.com>
---
tests/ofproto-dpif.at | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index 300d091..8818316 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -958,6 +958,7 @@ for delay in 1000 30000; do
ovs-appctl time/warp $delay
done
+sleep 1
OVS_VSWITCHD_STOP
ovs-appctl -t test-netflow exit
@@ -1006,6 +1007,7 @@ done
ovs-appctl time/warp 10000
+sleep 1
OVS_VSWITCHD_STOP
ovs-appctl -t test-netflow exit
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
