LVM2/test/shell dmeventd-restart.sh

LVM2/test/shell dmeventd-restart.sh

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2012-03-16 19:11:30

Modified files:
	test/shell     : dmeventd-restart.sh 

Log message:
	Skip dmeventd restart test
	
	If dmevendt is not in /sbin, do not try to run restarting test.
	FIXME: add some workaround for testing.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/shell/dmeventd-restart.sh.diff?cvsroot=lvm2&r1=1.2&r2=1.3

--- LVM2/test/shell/dmeventd-restart.sh	2012/03/16 13:00:06	1.2
+++ LVM2/test/shell/dmeventd-restart.sh	2012/03/16 19:11:29	1.3
@@ -14,6 +14,12 @@
 which mkfs.ext2 || skip
 
 aux prepare_dmeventd
+
+# Currently dmeventd doesn't support any other location
+# for dmeventd restart, so FIXME in dmeventd
+# and update this check
+test -x /sbin/dmeventd || skip
+
 aux prepare_vg 5
 
 lvcreate -m 3 --ig -L 1 -n 4way $vg

LVM2/test/shell dmeventd-restart.sh

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2012-03-20 13:35:46

Modified files:
	test/shell     : dmeventd-restart.sh 

Log message:
	Sleep longer in the test so it really dies properly
	
	and check for right exit code from pgrep

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/shell/dmeventd-restart.sh.diff?cvsroot=lvm2&r1=1.4&r2=1.5

--- LVM2/test/shell/dmeventd-restart.sh	2012/03/20 10:48:59	1.4
+++ LVM2/test/shell/dmeventd-restart.sh	2012/03/20 13:35:46	1.5
@@ -31,10 +31,15 @@
 
 # now try what happens if no dmeventd is running
 kill -9 $(cat LOCAL_DMEVENTD)
+rm LOCAL_DMEVENTD
+
 dmeventd -R -f &
-sleep 1
+echo $! >LOCAL_DMEVENTD
+
+# wait longer as tries to communicate with killed daemon
+sleep 7
 # now dmeventd should not be running
-pgrep dmeventd
+not pgrep dmeventd
 rm LOCAL_DMEVENTD
 
 # set dmeventd path