diff options
| author | Yifeng Sun <pkusunyifeng@gmail.com> | 2019-02-01 09:56:53 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2019-02-04 13:35:55 -0800 |
| commit | fcfd14ce3ae272cc24a786408e12d04e53cf6cdb (patch) | |
| tree | e6ea5b9c64137621199a1d5bfda079c11ae9e482 | |
| parent | 9b2b84973db76e1138d9234ff1b84bb6bb156011 (diff) | |
| download | openvswitch-fcfd14ce3ae272cc24a786408e12d04e53cf6cdb.tar.gz | |
test: Fix failed test "flow resume with geneve tun_metadata"
Test "flow resume with geneve tun_metadata" failed because there is
no controller running to handle the continuation message. A previous
commit deleted the line that starts ovs-ofctl as a controller in
order to avoid a race condition on monitor log. This patch adds
back this line but omits the log file because this test doesn't
depend on the log file.
Fixes: e8833217914f9c071c49 ("system-traffic.at: avoid a race condition on monitor log")
Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
CC: David Marchand <david.marchand@redhat.com>
Signed-off-by: Yifeng Sun <pkusunyifeng@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
| -rw-r--r-- | tests/system-traffic.at | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 3e3b9e74d..43ca32034 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -538,6 +538,8 @@ OVS_CHECK_GENEVE() OVS_TRAFFIC_VSWITCHD_START() ADD_BR([br-underlay]) +AT_CHECK([ovs-ofctl monitor br0 resume --detach --no-chdir --pidfile 2> /dev/null]) + ADD_NAMESPACES(at_ns0) dnl Set up underlay link from host into the namespace using veth pair. @@ -567,6 +569,7 @@ NS_CHECK_EXEC([at_ns0], [ping -q -c 3 10.1.1.100 | FORMAT_PING], [0], [dnl 3 packets transmitted, 3 received, 0% packet loss, time 0ms ]) +OVS_APP_EXIT_AND_WAIT([ovs-ofctl]) OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP |