shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

test: Move bus configuration to prepare function

Browse Source
This commit is contained in:
Marian Csontos 2016-03-22 09:15:40 +01:00
parent 1b0775916b
commit 82d92009ae
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/api/dbustest.sh
View File

@ -16,16 +16,7 @@ SKIP_WITH_CLVMD=1
. lib/inittest
# Will default to skip until we can get this reviewed
#skip
aux prepare_pvs 6
# Copy the needed file to run on the system bus if it doesn't
# already exist
if [ ! -f /etc/dbus-1/system.d/com.redhat.lvmdbus1.conf ]; then
install -m 644 $abs_top_builddir/scripts/com.redhat.lvmdbus1.conf /etc/dbus-1/system.d/.
fi
aux prepare_lvmdbusd
$test_data_dir/dbus/lvmdbustest.py -v

8
test/lib/aux.sh
View File

@ -306,6 +306,7 @@ prepare_lvmdbusd() {
kill_sleep_kill_ LOCAL_LVMDBUSD 0
# FIXME: This is not correct! Daemon is auto started.
echo "checking lvmdbusd is NOT running..."
if ps -elf | grep lvmdbusd | grep python3; then
echo "Cannot run while existing lvmdbusd process exists"
@ -327,6 +328,13 @@ prepare_lvmdbusd() {
which python3 >/dev/null || skip "Missing python3"
python3 -c "import pyudev, dbus, gi.repository" || skip "Missing python modules"
# TODO: Tests should use session bus instead of system bus
# Copy the needed file to run on the system bus if it doesn't
# already exist
if [ ! -f /etc/dbus-1/system.d/com.redhat.lvmdbus1.conf ]; then
install -m 644 $abs_top_builddir/scripts/com.redhat.lvmdbus1.conf /etc/dbus-1/system.d/
fi
echo "preparing lvmdbusd..."
"$daemon" --debug --udev > debug.log_LVMDBUSD_out 2>&1 &
local pid=$!