From: Loic Dachary <ldachary@redhat.com>
Date: Sat, 2 May 2015 15:20:47 +0000 (+0200)
Subject: tests: ceph-disk.sh must exit 1 on error
X-Git-Tag: v9.0.2~221^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1dad037532cc68d219f57992b6aee72b6f7377da;p=ceph.git

tests: ceph-disk.sh must exit 1 on error

The test for error was reversed and ceph-disk.sh always returned on the
the first successfull test, with no error.

And add verbosity to help with debugging.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/src/test/ceph-disk.sh b/src/test/ceph-disk.sh
index 6ec1ae9747ca..27b78fec273c 100755
--- a/src/test/ceph-disk.sh
+++ b/src/test/ceph-disk.sh
@@ -565,10 +565,14 @@ function run() {
     local actions=${@:-$default_actions}
     for action in $actions  ; do
         setup
+        set -x
         $action
         status=$?
+        set +x
         teardown
-        test $status != 0 || return $status
+        if test $status != 0 ; then
+            return $status
+        fi
     done
 }