From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-3728-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 6983 invoked by alias); 9 Dec 2010 11:19:24 -0000
Received: (qmail 6951 invoked by uid 9664); 9 Dec 2010 11:19:22 -0000
Date: Thu, 09 Dec 2010 11:19:00 -0000
Message-ID: <20101209111922.6949.qmail@sourceware.org>
From: mbroz@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/test test-utils.sh
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2010-12/txt/msg00017.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2010-12-09 11:19:21

Modified files:
	test           : test-utils.sh 

Log message:
	Try to detect fail in clvmd startup in tests.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/test-utils.sh.diff?cvsroot=lvm2&r1=1.55&r2=1.56

--- LVM2/test/test-utils.sh	2010/10/29 16:43:52	1.55
+++ LVM2/test/test-utils.sh	2010/12/09 11:19:21	1.56
@@ -77,6 +77,10 @@
 
 	clvmd -Isinglenode -d 1 &
 	LOCAL_CLVMD="$!"
+
+	# check that it is really running now
+	sleep .1
+	ps $LOCAL_CLVMD || exit 200
 }
 
 prepare_dmeventd() {
@@ -396,6 +400,7 @@
     locking_dir = "$TESTDIR/var/lock/lvm"
     $locktype
     si_unit_consistency = 1
+    fallback_to_local_locking = 0
   }
   activation {
     udev_sync = 1