]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: ceph-disk.sh must exit 1 on error
authorLoic Dachary <ldachary@redhat.com>
Sat, 2 May 2015 15:20:47 +0000 (17:20 +0200)
committerLoic Dachary <ldachary@redhat.com>
Tue, 5 May 2015 23:54:36 +0000 (01:54 +0200)
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>
src/test/ceph-disk.sh

index 6ec1ae9747ca30fce94db23f5e9d50583a001dd4..27b78fec273ca394953493ba45bd47da5dab7552 100755 (executable)
@@ -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
 }