Fixes failure of test due to not yet fully destroyed ports from
previous test if ovs-vswitchd was killed.
Example:
netdev_linux|WARN|br0: creating tap device failed: Device or resource busy
bridge|WARN|could not open network device br0 (Device or resource busy)
Signed-off-by: Ilya Maximets <i.maxim...@samsung.com>
---
tests/ofproto-macros.at | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at
index 8a664de..2817ea7 100644
--- a/tests/ofproto-macros.at
+++ b/tests/ofproto-macros.at
@@ -274,7 +274,7 @@ m4_define([_OVS_VSWITCHD_START],
dnl Start ovs-vswitchd.
AT_CHECK([ovs-vswitchd $1 --detach --no-chdir --pidfile --log-file -vvconn
-vofproto_dpif], [0], [], [stderr])
AT_CAPTURE_FILE([ovs-vswitchd.log])
- on_exit "kill `cat ovs-vswitchd.pid`"
+ on_exit "kill `cat ovs-vswitchd.pid` && sleep 1"
AT_CHECK([[sed < stderr '
/ovs_numa|INFO|Discovered /d
/vlog|INFO|opened log file/d
--
2.5.0
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
