From: David Zafman <dzafman@redhat.com>
Date: Wed, 9 Aug 2017 14:19:36 +0000 (-0700)
Subject: qa: Testing of ceph-helpers.sh, teardown on fail to dump logs, save cores
X-Git-Tag: v12.2.0~31^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f3a18b3b09e30802f3072abb461c55315a1e91ec;p=ceph.git

qa: Testing of ceph-helpers.sh, teardown on fail to dump logs, save cores

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit dddda523d1103847dc8b294d4998962c4bb6ddb4)
---

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index 5325ec7c2961..16996b377ec2 100755
--- a/qa/standalone/ceph-helpers.sh
+++ b/qa/standalone/ceph-helpers.sh
@@ -1904,7 +1904,10 @@ function run_tests() {
     local dir=td/ceph-helpers
 
     for func in $funcs ; do
-        $func $dir || return 1
+        if ! $func $dir; then
+            teardown $dir 1
+            return 1
+        fi
     done
 }