| Message ID | d8e0e4b812d7a11dfdbedfb155a5017216f3a662.1564400816.git.lorenzo.bianconi@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] test: do not require python2 for CHECK_CONNTRACK macro | expand |
Why do these macros require python at all? On 7/29/19 7:48 AM, Lorenzo Bianconi wrote: > Do not strictly require python2 for CHECK_CONNTRACK macro definitions in > system-{kmod,userspace}-macros.at > > Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> > --- > tests/system-kmod-macros.at | 2 +- > tests/system-userspace-macros.at | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at > index 554a61e9b..48e94642b 100644 > --- a/tests/system-kmod-macros.at > +++ b/tests/system-kmod-macros.at > @@ -59,7 +59,7 @@ m4_define([CONFIGURE_VETH_OFFLOADS], > # kernel conntrack tables when the test is finished. > # > m4_define([CHECK_CONNTRACK], > - [AT_SKIP_IF([test $HAVE_PYTHON2 = no]) > + [AT_SKIP_IF([test $HAVE_PYTHON = no]) > m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6], [nf_nat_ftp], > [nf_nat_tftp]], > [modprobe mod || echo "Module mod not loaded." > diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at > index 9d5f3bf41..a411e3d89 100644 > --- a/tests/system-userspace-macros.at > +++ b/tests/system-userspace-macros.at > @@ -65,7 +65,7 @@ m4_define([CONFIGURE_VETH_OFFLOADS], > # Perform requirements checks for running conntrack tests. > # > m4_define([CHECK_CONNTRACK], > - [AT_SKIP_IF([test $HAVE_PYTHON2 = no])] > + [AT_SKIP_IF([test $HAVE_PYTHON = no])] > ) > > # CHECK_CONNTRACK_ALG() >
Thanks Lorenzo Looks good On Mon, Jul 29, 2019 at 4:48 AM Lorenzo Bianconi < lorenzo.bianconi@redhat.com> wrote: > Do not strictly require python2 for CHECK_CONNTRACK macro definitions in > system-{kmod,userspace}-macros.at > > Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> > --- > tests/system-kmod-macros.at | 2 +- > tests/system-userspace-macros.at | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at > index 554a61e9b..48e94642b 100644 > --- a/tests/system-kmod-macros.at > +++ b/tests/system-kmod-macros.at > @@ -59,7 +59,7 @@ m4_define([CONFIGURE_VETH_OFFLOADS], > # kernel conntrack tables when the test is finished. > # > m4_define([CHECK_CONNTRACK], > - [AT_SKIP_IF([test $HAVE_PYTHON2 = no]) > + [AT_SKIP_IF([test $HAVE_PYTHON = no]) > m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6], > [nf_nat_ftp], > [nf_nat_tftp]], > [modprobe mod || echo "Module mod not loaded." > diff --git a/tests/system-userspace-macros.at b/tests/ > system-userspace-macros.at > index 9d5f3bf41..a411e3d89 100644 > --- a/tests/system-userspace-macros.at > +++ b/tests/system-userspace-macros.at > @@ -65,7 +65,7 @@ m4_define([CONFIGURE_VETH_OFFLOADS], > # Perform requirements checks for running conntrack tests. > # > m4_define([CHECK_CONNTRACK], > - [AT_SKIP_IF([test $HAVE_PYTHON2 = no])] > + [AT_SKIP_IF([test $HAVE_PYTHON = no])] > ) > > # CHECK_CONNTRACK_ALG() > -- > 2.21.0 > >
On Tue, Jul 30, 2019 at 10:41 AM Mark Michelson <mmichels@redhat.com> wrote: > Why do these macros require python at all? > alg test tools > > On 7/29/19 7:48 AM, Lorenzo Bianconi wrote: > > Do not strictly require python2 for CHECK_CONNTRACK macro definitions in > > system-{kmod,userspace}-macros.at > > > > Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> > > --- > > tests/system-kmod-macros.at | 2 +- > > tests/system-userspace-macros.at | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at > > index 554a61e9b..48e94642b 100644 > > --- a/tests/system-kmod-macros.at > > +++ b/tests/system-kmod-macros.at > > @@ -59,7 +59,7 @@ m4_define([CONFIGURE_VETH_OFFLOADS], > > # kernel conntrack tables when the test is finished. > > # > > m4_define([CHECK_CONNTRACK], > > - [AT_SKIP_IF([test $HAVE_PYTHON2 = no]) > > + [AT_SKIP_IF([test $HAVE_PYTHON = no]) > > m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6], > [nf_nat_ftp], > > [nf_nat_tftp]], > > [modprobe mod || echo "Module mod not loaded." > > diff --git a/tests/system-userspace-macros.at b/tests/ > system-userspace-macros.at > > index 9d5f3bf41..a411e3d89 100644 > > --- a/tests/system-userspace-macros.at > > +++ b/tests/system-userspace-macros.at > > @@ -65,7 +65,7 @@ m4_define([CONFIGURE_VETH_OFFLOADS], > > # Perform requirements checks for running conntrack tests. > > # > > m4_define([CHECK_CONNTRACK], > > - [AT_SKIP_IF([test $HAVE_PYTHON2 = no])] > > + [AT_SKIP_IF([test $HAVE_PYTHON = no])] > > ) > > > > # CHECK_CONNTRACK_ALG() > > > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
I applied this patch to OVN master as this fix is required for ovn repo too. Thanks Numan On Tue, Jul 30, 2019 at 11:51 PM Darrell Ball <dlu998@gmail.com> wrote: > On Tue, Jul 30, 2019 at 10:41 AM Mark Michelson <mmichels@redhat.com> > wrote: > > > Why do these macros require python at all? > > > > alg test tools > > > > > > > On 7/29/19 7:48 AM, Lorenzo Bianconi wrote: > > > Do not strictly require python2 for CHECK_CONNTRACK macro definitions > in > > > system-{kmod,userspace}-macros.at > > > > > > Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> > > > --- > > > tests/system-kmod-macros.at | 2 +- > > > tests/system-userspace-macros.at | 2 +- > > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at > > > index 554a61e9b..48e94642b 100644 > > > --- a/tests/system-kmod-macros.at > > > +++ b/tests/system-kmod-macros.at > > > @@ -59,7 +59,7 @@ m4_define([CONFIGURE_VETH_OFFLOADS], > > > # kernel conntrack tables when the test is finished. > > > # > > > m4_define([CHECK_CONNTRACK], > > > - [AT_SKIP_IF([test $HAVE_PYTHON2 = no]) > > > + [AT_SKIP_IF([test $HAVE_PYTHON = no]) > > > m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6], > > [nf_nat_ftp], > > > [nf_nat_tftp]], > > > [modprobe mod || echo "Module mod not loaded." > > > diff --git a/tests/system-userspace-macros.at b/tests/ > > system-userspace-macros.at > > > index 9d5f3bf41..a411e3d89 100644 > > > --- a/tests/system-userspace-macros.at > > > +++ b/tests/system-userspace-macros.at > > > @@ -65,7 +65,7 @@ m4_define([CONFIGURE_VETH_OFFLOADS], > > > # Perform requirements checks for running conntrack tests. > > > # > > > m4_define([CHECK_CONNTRACK], > > > - [AT_SKIP_IF([test $HAVE_PYTHON2 = no])] > > > + [AT_SKIP_IF([test $HAVE_PYTHON = no])] > > > ) > > > > > > # CHECK_CONNTRACK_ALG() > > > > > > > _______________________________________________ > > 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 Mon, Jul 29, 2019 at 01:48:33PM +0200, Lorenzo Bianconi wrote: > Do not strictly require python2 for CHECK_CONNTRACK macro definitions in > system-{kmod,userspace}-macros.at > > Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> I applied this to master and branch-2.12.
diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 554a61e9b..48e94642b 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -59,7 +59,7 @@ m4_define([CONFIGURE_VETH_OFFLOADS], # kernel conntrack tables when the test is finished. # m4_define([CHECK_CONNTRACK], - [AT_SKIP_IF([test $HAVE_PYTHON2 = no]) + [AT_SKIP_IF([test $HAVE_PYTHON = no]) m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6], [nf_nat_ftp], [nf_nat_tftp]], [modprobe mod || echo "Module mod not loaded." diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at index 9d5f3bf41..a411e3d89 100644 --- a/tests/system-userspace-macros.at +++ b/tests/system-userspace-macros.at @@ -65,7 +65,7 @@ m4_define([CONFIGURE_VETH_OFFLOADS], # Perform requirements checks for running conntrack tests. # m4_define([CHECK_CONNTRACK], - [AT_SKIP_IF([test $HAVE_PYTHON2 = no])] + [AT_SKIP_IF([test $HAVE_PYTHON = no])] ) # CHECK_CONNTRACK_ALG()
Do not strictly require python2 for CHECK_CONNTRACK macro definitions in system-{kmod,userspace}-macros.at Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> --- tests/system-kmod-macros.at | 2 +- tests/system-userspace-macros.at | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)