From: David Zafman <dzafman@redhat.com>
Date: Wed, 23 Nov 2016 19:46:57 +0000 (-0800)
Subject: test: CLEANUP make test clearer by using "fail" as argument
X-Git-Tag: v11.1.0~133^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ce85112d353b30a615093643d29410432d69b4cd;p=ceph-ci.git

test: CLEANUP make test clearer by using "fail" as argument

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

diff --git a/src/test/erasure-code/test-erasure-eio.sh b/src/test/erasure-code/test-erasure-eio.sh
index 63baef86384..059e6ea8c8c 100755
--- a/src/test/erasure-code/test-erasure-eio.sh
+++ b/src/test/erasure-code/test-erasure-eio.sh
@@ -88,12 +88,12 @@ function rados_get() {
     local dir=$1
     local poolname=$2
     local objname=${3:-SOMETHING}
-    local expect=${4:-0}
+    local expect=${4:-ok}
 
     #
     # Expect a failure to get object
     #
-    if [ $expect = "1" ];
+    if [ $expect = "fail" ];
     then
         ! rados --pool $poolname get $objname $dir/COPY
         return
@@ -117,7 +117,7 @@ function rados_put_get() {
     #
     rados_put $dir $poolname $objname || return 1
     # We can read even though caller injected read error on one of the shards
-    rados_get $dir $poolname $objname 0 || return 1
+    rados_get $dir $poolname $objname || return 1
 
     if [ -n "$recovery" ];
     then
@@ -131,7 +131,7 @@ function rados_put_get() {
         ceph osd out ${initial_osds[$last]} || return 1
         ! get_osds $poolname $objname | grep '\<'${initial_osds[$last]}'\>' || return 1
         # This will fail since one shard is out and one shard has injected read error
-        rados_get $dir $poolname $objname 1 || return 1
+        rados_get $dir $poolname $objname fail || return 1
         ceph osd in ${initial_osds[$last]} || return 1
     fi
 
@@ -172,7 +172,7 @@ function rados_get_data_eio() {
     shard_id=$(expr $shard_id + 1)
     inject_eio $objname $dir $shard_id || return 1
     # Now 2 out of 3 shards get EIO, so should fail
-    rados_get $dir $poolname $objname 1 || return 1
+    rados_get $dir $poolname $objname fail || return 1
 }
 
 # Change the size of speificied shard
@@ -224,12 +224,12 @@ function rados_get_data_bad_size() {
     #
     set_size $objname $dir $shard_id $bytes $mode || return 1
 
-    rados_get $dir $poolname $objname 0 || return 1
+    rados_get $dir $poolname $objname || return 1
 
     # Leave objname and modify another shard
     shard_id=$(expr $shard_id + 1)
     set_size $objname $dir $shard_id $bytes $mode || return 1
-    rados_get $dir $poolname $objname 1 || return 1
+    rados_get $dir $poolname $objname fail || return 1
 }
 
 #