diff options
| author | Gurucharan Shetty <guru@ovn.org> | 2016-08-16 05:26:06 -0700 |
|---|---|---|
| committer | Gurucharan Shetty <guru@ovn.org> | 2016-08-19 07:48:12 -0700 |
| commit | 576d1a80839e8fdec40edef8da2a3b342dcae0be (patch) | |
| tree | 1f3fd5533af6205eb183b597162a368ed51bfa63 | |
| parent | 5b9bf9e0675bb9f67479c2ac4cbf67cdc80850bf (diff) | |
| download | openvswitch-576d1a80839e8fdec40edef8da2a3b342dcae0be.tar.gz | |
system-ovn.at: Fix occasional test failures.
A run of the NAT unit tests hundred times showed some
occasional unit test failures. With this commit, I haven't
seen any failures for 100 runs.
Reported-by: Joe Stringer <joe@ovn.org>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Acked-by: Joe Stringer <joe@ovn.org>
| -rwxr-xr-x | tests/system-ovn.at | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/system-ovn.at b/tests/system-ovn.at index 09a5b6b6b..e2673841b 100755 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -166,7 +166,8 @@ as northd OVS_APP_EXIT_AND_WAIT([ovn-northd]) as -OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d"]) +OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d +/connection dropped.*/d"]) AT_CLEANUP AT_SETUP([ovn -- 2 LRs connected via LS, gateway router, easy SNAT]) @@ -247,6 +248,8 @@ ovn-nbctl lsp-add alice alice1 \ ovn-nbctl -- --id=@nat create nat type="snat" logical_ip=192.168.1.2 \ external_ip=172.16.1.1 -- add logical_router R2 nat @nat +OVS_WAIT_UNTIL([ovs-ofctl dump-flows br-int | grep ct\( | grep nat]) + # South-North SNAT: 'foo1' pings 'alice1'. But 'alice1' receives traffic # from 172.16.1.1 NS_CHECK_EXEC([foo1], [ping -q -c 3 -i 0.3 -w 2 172.16.1.2 | FORMAT_PING], \ @@ -272,7 +275,8 @@ as northd OVS_APP_EXIT_AND_WAIT([ovn-northd]) as -OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d"]) +OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d +/connection dropped.*/d"]) AT_CLEANUP AT_SETUP([ovn -- load-balancing]) |