[PATCH] tests: libmount: skip tabfiles-py when pylibmount is disabled

[PATCH] tests: libmount: skip tabfiles-py when pylibmount is disabled

[Mike Frysinger]

The default configure disables python support, so this test fails by
default.  Add a simple check for module availability.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 tests/ts/libmount/tabfiles-py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/ts/libmount/tabfiles-py b/tests/ts/libmount/tabfiles-py
index 64e8911..b89fb5b 100755
--- a/tests/ts/libmount/tabfiles-py
+++ b/tests/ts/libmount/tabfiles-py
@@ -12,6 +12,8 @@ ts_init_py libmount
 PYDBG="$PYTHON -m pdb"
 TESTPROG="$TS_HELPER_PYLIBMOUNT_TAB"
 
+$PYTHON -c 'import libmount' 2>/dev/null || ts_skip "pylibmount not compiled"
+
 ts_init_subtest "parse-fstab"
 $PYTHON $TESTPROG --parse "$TS_SELF/files/fstab" &> $TS_OUTPUT
 sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT
-- 
1.8.4.3

Re: [PATCH] tests: libmount: skip tabfiles-py when pylibmount is disabled

[Karel Zak]

On Sun, Dec 22, 2013 at 07:01:32PM -0500, Mike Frysinger wrote:
> The default configure disables python support, so this test fails by
> default.  Add a simple check for module availability.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
>  tests/ts/libmount/tabfiles-py | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/tests/ts/libmount/tabfiles-py b/tests/ts/libmount/tabfiles-py
> index 64e8911..b89fb5b 100755
> --- a/tests/ts/libmount/tabfiles-py
> +++ b/tests/ts/libmount/tabfiles-py
> @@ -12,6 +12,8 @@ ts_init_py libmount
>  PYDBG="$PYTHON -m pdb"
>  TESTPROG="$TS_HELPER_PYLIBMOUNT_TAB"
>  
> +$PYTHON -c 'import libmount' 2>/dev/null || ts_skip "pylibmount not compiled"
> +

Hmm... in function ts_init_py() is

    [ -f "$TS_TOPDIR/../py${LIBNAME}.la" ] || ts_skip "py${LIBNAME} not compiled"

and it works for me:

    $ ./ts/libmount/tabfiles-py te     libmount: tab files-py... IGNORE (pylibmount not compiled)

fixed by:

   commit f48145b500cc214746ae5dca997098ad22f41ead
   Author: Karel Zak <kzak@redhat.com>
   Date:   Thu Oct 3 16:20:38 2013 +0200

    testsL fix py<libname> check


    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com