From: David Zafman <dzafman@redhat.com>
Date: Fri, 8 Jun 2018 22:27:06 +0000 (-0700)
Subject: test: Fail immediately if some operations fail
X-Git-Tag: v14.0.1~1091^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fe09fc5e9da3fd2681e7c78d1df19142dc9e0eb7;p=ceph.git

test: Fail immediately if some operations fail

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/qa/standalone/scrub/osd-unexpected-clone.sh b/qa/standalone/scrub/osd-unexpected-clone.sh
index 8f0472f0e89b0..552644048b7d7 100755
--- a/qa/standalone/scrub/osd-unexpected-clone.sh
+++ b/qa/standalone/scrub/osd-unexpected-clone.sh
@@ -56,19 +56,19 @@ function TEST_recover_unexpected() {
     JSON=`objectstore_tool $dir $osd --op list foo | grep snapid.:1`
     echo "JSON is $JSON"
     rm -f $dir/_ $dir/data
-    objectstore_tool $dir $osd "$JSON" get-attr _ > $dir/_
-    objectstore_tool $dir $osd "$JSON" get-bytes $dir/data
+    objectstore_tool $dir $osd "$JSON" get-attr _ > $dir/_ || return 1
+    objectstore_tool $dir $osd "$JSON" get-bytes $dir/data || return 1
 
     rados -p foo rmsnap snap
 
     sleep 5
 
-    objectstore_tool $dir $osd "$JSON" set-bytes $dir/data
-    objectstore_tool $dir $osd "$JSON" set-attr _ $dir/_
+    objectstore_tool $dir $osd "$JSON" set-bytes $dir/data || return 1
+    objectstore_tool $dir $osd "$JSON" set-attr _ $dir/_ || return 1
 
     sleep 5
 
-    ceph pg repair 1.0
+    ceph pg repair 1.0 || return 1
 
     sleep 10