diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2015-02-11 17:13:45 +0530 |
|---|---|---|
| committer | Krishnan Parthasarathi <kparthas@redhat.com> | 2015-02-20 04:04:08 -0800 |
| commit | 9d842f965655bf70c643b4541844e83bc4e74190 (patch) | |
| tree | 4d248f27d77993a478267a41e0517228214d7fa0 /tests/basic | |
| parent | 571a71f0acd0ec59340b9d0d2519793e33a1dc16 (diff) | |
glusterd: nfs,shd,quotad,snapd daemons refactoring
This patch ports nfs, shd, quotad & snapd with the approach suggested in
http://www.gluster.org/pipermail/gluster-devel/2014-December/043180.html
Change-Id: I4ea5b38793f87fc85cc9d2cf873727351dedffd2
BUG: 1191486
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-on: http://review.gluster.org/9428
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Nekkunti <anekkunt@redhat.com>
Diffstat (limited to 'tests/basic')
| -rw-r--r-- | tests/basic/uss.t | 15 | ||||
| -rw-r--r-- | tests/basic/volume-status.t | 5 |
2 files changed, 16 insertions, 4 deletions
diff --git a/tests/basic/uss.t b/tests/basic/uss.t index aabe00cd880..2e4286860cf 100644 --- a/tests/basic/uss.t +++ b/tests/basic/uss.t @@ -12,6 +12,17 @@ function check_readonly() return $? } +function lookup() +{ + ls $1 + if [ "$?" == "0" ] + then + echo "Y" + else + echo "N" + fi +} + cleanup; TESTS_EXPECTED_IN_LOOP=10 @@ -179,7 +190,9 @@ TEST fd_close $fd3; # test 73 TEST $CLI volume set $V0 "features.snapshot-directory" .history -TEST ls $M0/.history; +#snapd client might take fraction of time to compare the volfile from glusterd +#hence a EXPECT_WITHIN is a better choice here +EXPECT_WITHIN 2 "Y" lookup "$M0/.history"; NUM_SNAPS=$(ls $M0/.history | wc -l); diff --git a/tests/basic/volume-status.t b/tests/basic/volume-status.t index bd85ab659bc..7d1b8326e3c 100644 --- a/tests/basic/volume-status.t +++ b/tests/basic/volume-status.t @@ -14,7 +14,8 @@ TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8}; TEST $CLI volume start $V0; -sleep 2 +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" nfs_up_status ## Mount FUSE TEST $GFS -s $H0 --volfile-id $V0 $M0; @@ -28,8 +29,6 @@ TEST mount_nfs $H0:/$V0 $N0 nolock; TEST $CLI volume status all TEST $CLI volume status $V0 -EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Y' nfs_up_status -EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Y' glustershd_up_status function test_nfs_cmds () { local ret=0 declare -a nfs_cmds=("clients" "mem" "inode" "callpool") |