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

dbustest.sh: Get dbus test to work on buildbot

Browse Source 
- stdout/stderr for test output
- debug.log* for daemon output
- use install instead of cp for DBus config
- use system bus
- DBus reloads on new file. Better having it created with correct
  permissions.

Notes:
- Squashed commits from mcsontos development branch
- Still disabled at this time

Signed-off-by: Tony Asleson <tasleson@redhat.com>
This commit is contained in:
Marian Csontos 2016-02-23 09:13:01 +01:00 committed by Tony Asleson
parent 9720898c8e
commit f94fe2c91f
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/api/dbustest.sh
View File

@ -21,18 +21,17 @@ skip
aux prepare_pvs 6 aux prepare_pvs 6
# This allows us to run without installing # Copy the needed file to run on the system bus if it doesn't
# com.redhat.lvmdbus1.conf to /etc/dbus-1/system.d/ # already exist
# but in normal operation it needs to be on system bus if [ ! -f /etc/dbus-1/system.d/com.redhat.lvmdbus1.conf ]; then
export LVMDBUSD_USE_SESSION="True" install -m 644 $abs_top_builddir/scripts/com.redhat.lvmdbus1.conf /etc/dbus-1/system.d/.
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
# Where should we be logging the output of the daemon when not running as
# a systemd service
# Start the dbus service # Start the dbus service
$abs_top_builddir/daemons/lvmdbusd/lvmdbusd --debug --udev > /tmp/lvmdbusd.log 2>&1 & $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 # Give the service some time to start before we try to run the
# unit test # unit test
@ -45,17 +44,16 @@ if [ "CHK${LVM_DBUS_PID}" == "CHK" ];then
fi fi
# Run all the unit tests # Run all the unit tests
# Are we already logging stdout & stderror? $abs_top_builddir/test/dbus/lvmdbustest.py -v || fail=$?
$abs_top_builddir/test/dbus/lvmdbustest.py -v > /tmp/lvmdbustest.log 2>&1
# We can run individual unit tests by doing this # We can run individual unit tests by doing this
# $abs_top_builddir/test/dbus/lvmdbustest.py -v TestDbusService.test_snapshot_merge # $abs_top_builddir/test/dbus/lvmdbustest.py -v TestDbusService.test_snapshot_merge
# I'm guessing there is a better way to handle this with the built in test env.
if [ $? -eq 0 ]; then
rm -f /tmp/lvmdbusd.log
rm -f /tmp/lvmdbustest.log
fi
echo "Stopping service" echo "Stopping service"
kill $LVM_DBUS_PID kill $LVM_DBUS_PID || {
sleep 1
kill -9 $LVM_DBUS_PID
}
wait
exit ${fail:-"0"}