| Message ID | 1461273012-62370-1-git-send-email-joe@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
Thanks for fixing this Acked-by: Daniele Di Proietto <diproiettod@vmware.com> On 21/04/2016 14:10, "Joe Stringer" <joe@ovn.org> wrote: >This was missed before somehow, which would cause the test to fail >(rather than being skipped) if iproute2 didn't support setting the >vxlan dstport on the kernel tunnel device. > >Signed-off-by: Joe Stringer <joe@ovn.org> >--- > tests/system-traffic.at | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/tests/system-traffic.at b/tests/system-traffic.at >index dceae150d148..10c571769462 100644 >--- a/tests/system-traffic.at >+++ b/tests/system-traffic.at >@@ -1495,7 +1495,7 @@ OVS_TRAFFIC_VSWITCHD_STOP > AT_CLEANUP > > AT_SETUP([conntrack - IPv6 Fragmentation over vxlan]) >-AT_SKIP_IF([! ip link help 2>&1 | grep vxlan >/dev/null]) >+OVS_CHECK_VXLAN() > CHECK_CONNTRACK() > > OVS_TRAFFIC_VSWITCHD_START() >-- >2.1.4 >
On 21 April 2016 at 17:07, Daniele Di Proietto <diproiettod@vmware.com> wrote: > Thanks for fixing this > > Acked-by: Daniele Di Proietto <diproiettod@vmware.com> Thanks, applied to master.
diff --git a/tests/system-traffic.at b/tests/system-traffic.at index dceae150d148..10c571769462 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -1495,7 +1495,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([conntrack - IPv6 Fragmentation over vxlan]) -AT_SKIP_IF([! ip link help 2>&1 | grep vxlan >/dev/null]) +OVS_CHECK_VXLAN() CHECK_CONNTRACK() OVS_TRAFFIC_VSWITCHD_START()
This was missed before somehow, which would cause the test to fail (rather than being skipped) if iproute2 didn't support setting the vxlan dstport on the kernel tunnel device. Signed-off-by: Joe Stringer <joe@ovn.org> --- tests/system-traffic.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)