From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17446 invoked by alias); 30 Jun 2011 09:08:24 -0000 Received: (qmail 17429 invoked by uid 9737); 30 Jun 2011 09:08:23 -0000 Date: Thu, 30 Jun 2011 09:08:00 -0000 Message-ID: <20110630090823.17427.qmail@sourceware.org> From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/test/lib aux.sh Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2011-06/txt/msg00085.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2011-06-30 09:08:22 Modified files: test/lib : aux.sh Log message: Use -f to remove device Since some test may leave devices in suspend mode which would require carefull order of resume operation - use '-f' to replace them with error targets For disable_dev - when 'error' target is used for open count - treat return code as ok (|| true) to avoid breaking futher test processing. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/lib/aux.sh.diff?cvsroot=lvm2&r1=1.22&r2=1.23 --- LVM2/test/lib/aux.sh 2011/06/30 08:50:10 1.22 +++ LVM2/test/lib/aux.sh 2011/06/30 09:08:22 1.23 @@ -71,7 +71,7 @@ while dmsetup table | grep -q ^$PREFIX; do for s in `dmsetup info -c -o name --noheading | grep ^$PREFIX`; do umount -fl $DM_DEV_DIR/mapper/$s >& /dev/null || true - dmsetup remove $s >& /dev/null || true + dmsetup remove -f $s >& /dev/null || true done done finish_udev_transaction @@ -292,7 +292,7 @@ init_udev_transaction for dev in "$@"; do - dmsetup remove -f $dev + dmsetup remove -f $dev || true done finish_udev_transaction