From 2ad55cd601d57003d9ac169c9574b589612368e4 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 11 Dec 2014 18:33:31 +0100 Subject: [PATCH] tests: do not ignore ceph-disk.sh::test_activate_dev failure The status of the test commands must be tested instead of being silently ignored. Signed-off-by: Loic Dachary --- src/test/ceph-disk.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/test/ceph-disk.sh b/src/test/ceph-disk.sh index be03011438f1..1ed38cb5b8d6 100755 --- a/src/test/ceph-disk.sh +++ b/src/test/ceph-disk.sh @@ -231,6 +231,16 @@ function test_activate_dir() { $rm -fr $osd_data } +function activate_dev_body() { + local disk=$1 + + ./ceph-disk zap $disk || return 1 + test_activate ${disk} ${disk}p1 || return 1 + kill_daemons + umount ${disk}p1 || return 1 + ./ceph-disk zap $disk || return 1 +} + function test_activate_dev() { run_mon @@ -242,11 +252,7 @@ function test_activate_dev() { dd if=/dev/zero of=vde.disk bs=1024k count=200 losetup --find vde.disk local disk=$(losetup --associated vde.disk | cut -f1 -d:) - ./ceph-disk zap $disk - test_activate ${disk} ${disk}p1 - kill_daemons - umount ${disk}p1 - ./ceph-disk zap $disk + activate_dev_body $disk status=$? losetup --detach $disk rm vde.disk -- 2.47.3