| Message ID | 20210804093016.2433236-1-xsimonar@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] system-test: Fix "2 LSs IGMP and MLD" | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
On 04/08/2021 10:30, Xavier Simonart wrote: > When ADD_NAMESPACES or ADD_VETH were executed with variables > within the arguments (e.g. ADD_NAMESPACES(sw1-p$i)), the macros were > not expanded properly, resulting in bad on_exit calls. > This caused multiples tests (e.g. 2 LSs IGMP and MLD) to be skipped. > > Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=1858221 > Signed-off-by: Xavier Simonart <xsimonar@redhat.com> > --- > tests/system-common-macros.at | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at > index b742a2cb9..616a87fcf 100644 > --- a/tests/system-common-macros.at > +++ b/tests/system-common-macros.at > @@ -16,7 +16,7 @@ m4_define([ADD_NAMESPACES], > [m4_foreach([ns], [$@], > [DEL_NAMESPACES(ns) > AT_CHECK([ip netns add ns || return 77]) > - on_exit 'DEL_NAMESPACES(ns)' > + on_exit "DEL_NAMESPACES(ns)" > ip netns exec ns sysctl -w net.netfilter.nf_conntrack_helper=0 > ]) > ] > @@ -85,7 +85,7 @@ m4_define([ADD_VETH], > if test -n "$6"; then > NS_CHECK_EXEC([$2], [ip route add default via $6]) > fi > - on_exit 'ip link del ovs-$1' > + on_exit "ip link del ovs-$1" > ] > ) > > Acked-by: Mark D. Gray <mark.d.gray@redhat.com>
On Thu, Aug 5, 2021 at 11:15 AM Mark Gray <mark.d.gray@redhat.com> wrote: > > On 04/08/2021 10:30, Xavier Simonart wrote: > > When ADD_NAMESPACES or ADD_VETH were executed with variables > > within the arguments (e.g. ADD_NAMESPACES(sw1-p$i)), the macros were > > not expanded properly, resulting in bad on_exit calls. > > This caused multiples tests (e.g. 2 LSs IGMP and MLD) to be skipped. > > > > Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=1858221 > > Signed-off-by: Xavier Simonart <xsimonar@redhat.com> > > --- > > tests/system-common-macros.at | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at > > index b742a2cb9..616a87fcf 100644 > > --- a/tests/system-common-macros.at > > +++ b/tests/system-common-macros.at > > @@ -16,7 +16,7 @@ m4_define([ADD_NAMESPACES], > > [m4_foreach([ns], [$@], > > [DEL_NAMESPACES(ns) > > AT_CHECK([ip netns add ns || return 77]) > > - on_exit 'DEL_NAMESPACES(ns)' > > + on_exit "DEL_NAMESPACES(ns)" > > ip netns exec ns sysctl -w net.netfilter.nf_conntrack_helper=0 > > ]) > > ] > > @@ -85,7 +85,7 @@ m4_define([ADD_VETH], > > if test -n "$6"; then > > NS_CHECK_EXEC([$2], [ip route add default via $6]) > > fi > > - on_exit 'ip link del ovs-$1' > > + on_exit "ip link del ovs-$1" > > ] > > ) > > > > > Acked-by: Mark D. Gray <mark.d.gray@redhat.com> Thanks for the fix. I applied to the main branch. Numan > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at index b742a2cb9..616a87fcf 100644 --- a/tests/system-common-macros.at +++ b/tests/system-common-macros.at @@ -16,7 +16,7 @@ m4_define([ADD_NAMESPACES], [m4_foreach([ns], [$@], [DEL_NAMESPACES(ns) AT_CHECK([ip netns add ns || return 77]) - on_exit 'DEL_NAMESPACES(ns)' + on_exit "DEL_NAMESPACES(ns)" ip netns exec ns sysctl -w net.netfilter.nf_conntrack_helper=0 ]) ] @@ -85,7 +85,7 @@ m4_define([ADD_VETH], if test -n "$6"; then NS_CHECK_EXEC([$2], [ip route add default via $6]) fi - on_exit 'ip link del ovs-$1' + on_exit "ip link del ovs-$1" ] )
When ADD_NAMESPACES or ADD_VETH were executed with variables within the arguments (e.g. ADD_NAMESPACES(sw1-p$i)), the macros were not expanded properly, resulting in bad on_exit calls. This caused multiples tests (e.g. 2 LSs IGMP and MLD) to be skipped. Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=1858221 Signed-off-by: Xavier Simonart <xsimonar@redhat.com> --- tests/system-common-macros.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)