From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-5078-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 15075 invoked by alias); 15 Feb 2012 13:51:20 -0000
Received: (qmail 15039 invoked by uid 9737); 15 Feb 2012 13:51:19 -0000
Date: Wed, 15 Feb 2012 13:51:00 -0000
Message-ID: <20120215135119.15037.qmail@sourceware.org>
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/test/shell snapshot-merge.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: 2012-02/txt/msg00112.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2012-02-15 13:51:18

Modified files:
	test/shell     : snapshot-merge.sh 

Log message:
	Deal with slower test processing
	
	If the merge was faster then query - deal with it and pass the test.

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

--- LVM2/test/shell/snapshot-merge.sh	2011/11/21 00:15:46	1.1
+++ LVM2/test/shell/snapshot-merge.sh	2012/02/15 13:51:17	1.2
@@ -78,7 +78,8 @@
 # -- refresh LV to start merge (now that FS is unmounted),
 #    an active merge uses the 'snapshot-merge' target
 lvchange --refresh $vg/$lv1
-dmsetup table ${vg}-${lv1} | grep " snapshot-merge "
+# check whether it's still merging - or maybe got already merged (slow test)
+dmsetup table ${vg}-${lv1} | grep " snapshot-merge " || dmsetup table ${vg}-${lv1} | grep " linear "
 # -- don't care if merge is still active; lvremove at this point
 #    may test stopping an active merge
 lvremove -f $vg/$lv1