From: Marian Csontos <mcsontos@redhat.com>
Date: Tue, 22 Mar 2016 08:15:40 +0000 (+0100)
Subject: test: Move bus configuration to prepare function
X-Git-Tag: v2_02_148~6
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=82d92009ae37bea3cd6a3f754c25d56b12959676;p=lvm2.git

test: Move bus configuration to prepare function
---

diff --git a/test/api/dbustest.sh b/test/api/dbustest.sh
index 79e3224c4..8741eb93c 100644
--- a/test/api/dbustest.sh
+++ b/test/api/dbustest.sh
@@ -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
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 276788054..9fd1922e3 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -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=$!