public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2/test/shell snapshot-merge.sh
@ 2012-02-15 13:51 zkabelac
0 siblings, 0 replies; only message in thread
From: zkabelac @ 2012-02-15 13:51 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-02-15 13:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-15 13:51 LVM2/test/shell snapshot-merge.sh zkabelac
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).