summaryrefslogtreecommitdiffstats
path: root/tests/bugs/shard/bug-shard-zerofill.t
diff options
context:
space:
mode:
authorKrutika Dhananjay <kdhananj@redhat.com>2016-03-08 15:44:04 +0530
committerJeff Darcy <jdarcy@redhat.com>2016-03-11 11:10:30 -0800
commit0e048b309b64e574039fc1ebedb971791d43b5e1 (patch)
tree0b9adb61d7872a09113283f42b5e46e913efa559 /tests/bugs/shard/bug-shard-zerofill.t
parentdf7390c9d7db40dcd68cf1020b6248f5105ab8eb (diff)
features/shard: Implement discard fop
Change-Id: Ia5bd8d36b21a586df6556fbec3474892d5871229 BUG: 1261841 Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com> Reviewed-on: http://review.gluster.org/13657 Smoke: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com> Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'tests/bugs/shard/bug-shard-zerofill.t')
-rw-r--r--tests/bugs/shard/bug-shard-zerofill.t8
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/bugs/shard/bug-shard-zerofill.t b/tests/bugs/shard/bug-shard-zerofill.t
index c3211493fe1..ad508c83236 100644
--- a/tests/bugs/shard/bug-shard-zerofill.t
+++ b/tests/bugs/shard/bug-shard-zerofill.t
@@ -3,10 +3,6 @@
. $(dirname $0)/../../include.rc
. $(dirname $0)/../../volume.rc
-function file_all_zeroes {
- < $1 tr -d '\0' | read -n 1 || echo 1
-}
-
cleanup
TEST glusterd
@@ -23,7 +19,7 @@ TEST touch $M0/foo
gfid_foo=$(get_gfid_string $M0/foo)
TEST gcc -Wall -O2 -I api/src -o $(dirname $0)/bug-shard-zerofill $(dirname $0)/bug-shard-zerofill.c -lgfapi
-TEST $(dirname $0)/bug-shard-zerofill $H0 $V0 /foo
+TEST $(dirname $0)/bug-shard-zerofill $H0 $V0 /foo `gluster --print-logdir`/glfs-$V0.log
# This should ensure /.shard is created on the bricks.
TEST stat $B0/${V0}0/.shard
@@ -40,7 +36,7 @@ TEST `echo "abc" >> $M0/foo`
EXPECT_NOT "1" file_all_zeroes $M0/foo
-TEST umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
TEST $CLI volume stop $V0
TEST $CLI volume delete $V0