[ovs-dev] test: do not require python2 for CHECK_CONNTRACK macro
diff mbox series

Message ID d8e0e4b812d7a11dfdbedfb155a5017216f3a662.1564400816.git.lorenzo.bianconi@redhat.com
State New
Headers show
Series
  • [ovs-dev] test: do not require python2 for CHECK_CONNTRACK macro
Related show

Commit Message

Lorenzo Bianconi July 29, 2019, 11:48 a.m. UTC
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(-)

Comments

Mark Michelson July 30, 2019, 5:31 p.m. UTC | #1
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()
>
Darrell Ball July 30, 2019, 6:08 p.m. UTC | #2
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
>
>
Darrell Ball July 30, 2019, 6:09 p.m. UTC | #3
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
>

Patch
diff mbox series

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()