shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-08-25 13:49:28 +03:00
Code Releases Activity

tests: aux prepares lvmdbusd

Browse Source 
Correctly skip the test when lvmdbusd is found already running.
For pgrep usage we need to add '-f -l' options to get python3 name
printed.
Remove no longer used 'pids' local var.
This commit is contained in:
Zdenek Kabelac
2017-06-30 12:07:30 +02:00
parent 674a93ffe3
commit 9348ad4f16
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/lib/aux.sh
View File

@ -309,9 +309,8 @@ prepare_lvmdbusd() {
# FIXME: This is not correct! Daemon is auto started.
echo "checking lvmdbusd is NOT running..."
if pgrep lvmdbusd | grep python3; then
echo "Cannot run while existing lvmdbusd process exists"
return 1
if pgrep -f -l lvmdbusd | grep python3 ; then
skip "Cannot run while existing lvmdbusd process exists"
fi
echo ok
@ -320,7 +319,7 @@ prepare_lvmdbusd() {
# NOTE: this is always present - additional checks are needed:
daemon="$abs_top_builddir/daemons/lvmdbusd/lvmdbusd"
# Setup the python path so we can run
export PYTHONPATH=$abs_top_builddir/daemons
export PYTHONPATH="$abs_top_builddir/daemons"
else
daemon=$(which lvmdbusd || :)
fi
@ -343,7 +342,7 @@ prepare_lvmdbusd() {
sleep 1
echo "checking lvmdbusd IS running..."
if ! pgrep lvmdbusd | grep python3; then
if ! pgrep -f -l lvmdbusd | grep python3; then
echo "Failed to start lvmdbusd daemon"
return 1
fi
@ -496,7 +495,6 @@ count_processes_with_tag() {
kill_tagged_processes() {
local pid
local pids
local wait
# read uses all vars within pipe subshell