| Message ID | 20210429010356.2262597-1-hzhou@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] ovn-ipsec.at: Fix occasional failure of test "unsupported multiple ovn-encap-ip values". | expand |
On Wed, Apr 28, 2021 at 9:04 PM Han Zhou <hzhou@ovn.org> wrote: > > This test case is very likely to fail with address sanitizer enabled. > This patch fixes the timing problem in the test case. > > Signed-off-by: Han Zhou <hzhou@ovn.org> Thanks for fixing this. Acked-by: Numan Siddique <numans@ovn.org> Numan > --- > tests/ovn-ipsec.at | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/ovn-ipsec.at b/tests/ovn-ipsec.at > index 887281d5b..8f1cad54c 100644 > --- a/tests/ovn-ipsec.at > +++ b/tests/ovn-ipsec.at > @@ -99,6 +99,6 @@ ovs-vsctl \ > -- set Open_vSwitch . other_config:private_key=dummy-privkey.pem \ > -- set Open_vSwitch . other_config:ca_cert=dummy-cacert.pem > > -AT_CHECK([grep "ovn-encap-ip has been configured as a list. This is unsupported for IPsec." hv1/ovn-controller.log],[0], ignore) > +OVS_WAIT_UNTIL([grep "ovn-encap-ip has been configured as a list. This is unsupported for IPsec." hv1/ovn-controller.log]) > > -AT_CLEANUP > \ No newline at end of file > +AT_CLEANUP > -- > 2.30.2 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On 29/04/2021 15:27, Numan Siddique wrote: > On Wed, Apr 28, 2021 at 9:04 PM Han Zhou <hzhou@ovn.org> wrote: >> >> This test case is very likely to fail with address sanitizer enabled. >> This patch fixes the timing problem in the test case. >> >> Signed-off-by: Han Zhou <hzhou@ovn.org> > > Thanks for fixing this. > > Acked-by: Numan Siddique <numans@ovn.org> Acked-by: Mark D. Gray <mark.d.gray@redhat.com> > > Numan > >> --- >> tests/ovn-ipsec.at | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/tests/ovn-ipsec.at b/tests/ovn-ipsec.at >> index 887281d5b..8f1cad54c 100644 >> --- a/tests/ovn-ipsec.at >> +++ b/tests/ovn-ipsec.at >> @@ -99,6 +99,6 @@ ovs-vsctl \ >> -- set Open_vSwitch . other_config:private_key=dummy-privkey.pem \ >> -- set Open_vSwitch . other_config:ca_cert=dummy-cacert.pem >> >> -AT_CHECK([grep "ovn-encap-ip has been configured as a list. This is unsupported for IPsec." hv1/ovn-controller.log],[0], ignore) >> +OVS_WAIT_UNTIL([grep "ovn-encap-ip has been configured as a list. This is unsupported for IPsec." hv1/ovn-controller.log]) >> >> -AT_CLEANUP >> \ No newline at end of file >> +AT_CLEANUP >> -- >> 2.30.2 >> >> _______________________________________________ >> dev mailing list >> dev@openvswitch.org >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev >> > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On Thu, Apr 29, 2021 at 9:12 AM Mark Gray <mark.d.gray@redhat.com> wrote: > > On 29/04/2021 15:27, Numan Siddique wrote: > > On Wed, Apr 28, 2021 at 9:04 PM Han Zhou <hzhou@ovn.org> wrote: > >> > >> This test case is very likely to fail with address sanitizer enabled. > >> This patch fixes the timing problem in the test case. > >> > >> Signed-off-by: Han Zhou <hzhou@ovn.org> > > > > Thanks for fixing this. > > > > Acked-by: Numan Siddique <numans@ovn.org> > > Acked-by: Mark D. Gray <mark.d.gray@redhat.com> Thanks Numan and Mark. I applied this to master. > > > > Numan > > > >> --- > >> tests/ovn-ipsec.at | 4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > >> > >> diff --git a/tests/ovn-ipsec.at b/tests/ovn-ipsec.at > >> index 887281d5b..8f1cad54c 100644 > >> --- a/tests/ovn-ipsec.at > >> +++ b/tests/ovn-ipsec.at > >> @@ -99,6 +99,6 @@ ovs-vsctl \ > >> -- set Open_vSwitch . other_config:private_key=dummy-privkey.pem \ > >> -- set Open_vSwitch . other_config:ca_cert=dummy-cacert.pem > >> > >> -AT_CHECK([grep "ovn-encap-ip has been configured as a list. This is unsupported for IPsec." hv1/ovn-controller.log],[0], ignore) > >> +OVS_WAIT_UNTIL([grep "ovn-encap-ip has been configured as a list. This is unsupported for IPsec." hv1/ovn-controller.log]) > >> > >> -AT_CLEANUP > >> \ No newline at end of file > >> +AT_CLEANUP > >> -- > >> 2.30.2 > >> > >> _______________________________________________ > >> dev mailing list > >> dev@openvswitch.org > >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev > >> > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > > >
diff --git a/tests/ovn-ipsec.at b/tests/ovn-ipsec.at index 887281d5b..8f1cad54c 100644 --- a/tests/ovn-ipsec.at +++ b/tests/ovn-ipsec.at @@ -99,6 +99,6 @@ ovs-vsctl \ -- set Open_vSwitch . other_config:private_key=dummy-privkey.pem \ -- set Open_vSwitch . other_config:ca_cert=dummy-cacert.pem -AT_CHECK([grep "ovn-encap-ip has been configured as a list. This is unsupported for IPsec." hv1/ovn-controller.log],[0], ignore) +OVS_WAIT_UNTIL([grep "ovn-encap-ip has been configured as a list. This is unsupported for IPsec." hv1/ovn-controller.log]) -AT_CLEANUP \ No newline at end of file +AT_CLEANUP
This test case is very likely to fail with address sanitizer enabled. This patch fixes the timing problem in the test case. Signed-off-by: Han Zhou <hzhou@ovn.org> --- tests/ovn-ipsec.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)