summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Asleson <tasleson@redhat.com>2016-10-10 16:26:38 -0500
committerTony Asleson <tasleson@redhat.com>2016-10-10 16:33:42 -0500
commit20e74313cd8abaa691fb4f1015a84b34171aa08a (patch)
tree24e4c7e438100261c5cb434f9468ca96e307dd38
parentbe06fa695ea9833bcc25c09a17c6396cca07be31 (diff)
downloadlvm2-20e74313cd8abaa691fb4f1015a84b34171aa08a.tar.gz
lvmdbustest.py: Add profile and path for lvm binary
-rw-r--r--test/api/dbustest.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/test/api/dbustest.sh b/test/api/dbustest.sh
index 8741eb93c..16dc186b8 100644
--- a/test/api/dbustest.sh
+++ b/test/api/dbustest.sh
@@ -18,5 +18,19 @@ SKIP_WITH_CLVMD=1
aux prepare_pvs 6
+# We need the lvmdbusd.profile for the daemon to utilize JSON
+# output
+mkdir -p $TESTDIR/etc/profile/
+cp -v $TESTOLDPWD/../conf/lvmdbusd.profile $TESTDIR/etc/profile/.
+
+# Need to set this up so that the lvmdbusd service knows which
+# binary to be running, which should be the one we just built
+export LVM_BINARY=$TESTOLDPWD/../tools/lvm
+
aux prepare_lvmdbusd
+
+# Lets limit testing until the lvm SIGABRT is fixed as
+# we are running into that when using the lvm shell
+export LVM_DBUS_TEST_SHELL=0
+
$test_data_dir/dbus/lvmdbustest.py -v