mirror of
git://sourceware.org/git/lvm2.git
synced 2025-03-10 16:58:47 +03:00
test: Remove work-in-progress code from dbustest
(cherry picked from commit 3189d4d50492f5b78cf3920a7f499fd1020983c6)
This commit is contained in:
parent
e72184bb76
commit
18291fd016
@ -30,40 +30,5 @@ fi
|
|||||||
# Setup the python path so we can run
|
# Setup the python path so we can run
|
||||||
export PYTHONPATH=$abs_top_builddir/daemons
|
export PYTHONPATH=$abs_top_builddir/daemons
|
||||||
|
|
||||||
if true; then
|
|
||||||
|
|
||||||
aux prepare_lvmdbusd
|
aux prepare_lvmdbusd
|
||||||
$abs_top_builddir/test/dbus/lvmdbustest.py -v
|
$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 &
|
|
||||||
|
|
||||||
# Give the service some time to start before we try to run the
|
|
||||||
# unit test
|
|
||||||
sleep 1
|
|
||||||
|
|
||||||
LVM_DBUS_PID=$(ps aux | grep lvmdbus[d] | awk '{print $2}')
|
|
||||||
if [ "CHK${LVM_DBUS_PID}" == "CHK" ];then
|
|
||||||
echo "Failed to start lvmdbusd daemon"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
END
|
|
||||||
|
|
||||||
# Run all the unit tests
|
|
||||||
$abs_top_builddir/test/dbus/lvmdbustest.py -v || fail=$?
|
|
||||||
|
|
||||||
# We can run individual unit tests by doing this
|
|
||||||
# $abs_top_builddir/test/dbus/lvmdbustest.py -v TestDbusService.test_snapshot_merge
|
|
||||||
|
|
||||||
echo "Stopping service"
|
|
||||||
kill $LVM_DBUS_PID || {
|
|
||||||
sleep 1
|
|
||||||
kill -9 $LVM_DBUS_PID
|
|
||||||
}
|
|
||||||
wait
|
|
||||||
|
|
||||||
exit ${fail:-"0"}
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user