diff options
| author | Marian Csontos <mcsontos@redhat.com> | 2016-03-23 11:45:21 +0100 |
|---|---|---|
| committer | Marian Csontos <mcsontos@redhat.com> | 2016-03-23 11:58:48 +0100 |
| commit | c1d376b1abdb6b6a2410a5372a3a76748c1daa98 (patch) | |
| tree | 048145f5dc2ee7b92f53ef08ad159e7577f096bb | |
| parent | c6d383a6da5cd7f5acddb314e1419243447e7be8 (diff) | |
| download | lvm2-c1d376b1abdb6b6a2410a5372a3a76748c1daa98.tar.gz | |
test: Fix checks to skip lvmdbusd tests
The executable is always present in the tree, need to check the
runtime dependencies.
| -rw-r--r-- | test/lib/aux.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh index af6b25a45..ed1e3d827 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -311,10 +311,12 @@ prepare_lvmdbusd() { echo ok # skip if we don't have our own lvmdbusd... - # TODO: lvmdbusd is not in PATH - #(which lvmdbusd 2>/dev/null | grep "$abs_builddir") || skip + # NOTE: this is always present - additional checks are needed: [[ -x $abs_top_builddir/daemons/lvmdbusd/lvmdbusd ]] || skip + which python3 >/dev/null || skip "Missing python3" + python3 -c "import pyudev, dbus, gi.repository" || skip "Missing python modules" + kill_sleep_kill_ LOCAL_LVMDBUSD 0 echo "preparing lvmdbusd..." |