summaryrefslogtreecommitdiff
path: root/test/api
diff options
context:
space:
mode:
authorMarian Csontos <mcsontos@redhat.com>2016-03-01 11:49:05 +0100
committerMarian Csontos <mcsontos@redhat.com>2016-03-09 10:58:21 +0100
commite655ccb418d942889aae5c83af25ca8d085825b8 (patch)
treee67ddd02886e61116dfe92fc665a06e45fe57f03 /test/api
parentd7ca164597ec5f334c061ffbad78677c4b36f281 (diff)
downloadlvm2-e655ccb418d942889aae5c83af25ca8d085825b8.tar.gz
test: Add prepare_lvmdbusd
- Check for running lvmdbusd at start - Add teardown for lvmdbusd
Diffstat (limited to 'test/api')
-rw-r--r--test/api/dbustest.sh12
1 files changed, 11 insertions, 1 deletions
diff --git a/test/api/dbustest.sh b/test/api/dbustest.sh
index ba3173e92..0ef9a9584 100644
--- a/test/api/dbustest.sh
+++ b/test/api/dbustest.sh
@@ -30,6 +30,13 @@ fi
# Setup the python path so we can run
export PYTHONPATH=$abs_top_builddir/daemons
+if true; then
+
+aux prepare_lvmdbusd
+$abs_top_builddir/test/dbus/lvmdbustest.py -v
+
+else
+
# Start the dbus service
$abs_top_builddir/daemons/lvmdbusd/lvmdbusd --debug --udev > debug.log_lvmdbusd 2>&1 &
@@ -39,9 +46,10 @@ sleep 1
LVM_DBUS_PID=$(ps aux | grep lvmdbus[d] | awk '{print $2}')
if [ "CHK${LVM_DBUS_PID}" == "CHK" ];then
- echo "Failed to start lsmdbusd daemon"
+ echo "Failed to start lvmdbusd daemon"
exit 1
fi
+END
# Run all the unit tests
$abs_top_builddir/test/dbus/lvmdbustest.py -v || fail=$?
@@ -57,3 +65,5 @@ kill $LVM_DBUS_PID || {
wait
exit ${fail:-"0"}
+
+fi