summaryrefslogtreecommitdiffstats
path: root/tests/bugs/distribute/bug-1161156.t
diff options
context:
space:
mode:
Diffstat (limited to 'tests/bugs/distribute/bug-1161156.t')
-rwxr-xr-xtests/bugs/distribute/bug-1161156.t11
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/bugs/distribute/bug-1161156.t b/tests/bugs/distribute/bug-1161156.t
index bedbf74ec05..2b9e15407ca 100755
--- a/tests/bugs/distribute/bug-1161156.t
+++ b/tests/bugs/distribute/bug-1161156.t
@@ -4,12 +4,7 @@
. $(dirname $0)/../../volume.rc
. $(dirname $0)/../../nfs.rc
-function usage()
-{
- local QUOTA_PATH=$1;
- $CLI volume quota $V0 list $QUOTA_PATH | \
- grep "$QUOTA_PATH" | awk '{print $4}'
-}
+#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST
cleanup;
@@ -24,6 +19,7 @@ TEST $CLI volume info;
TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2,3,4,5,6};
EXPECT 'Created' volinfo_field $V0 'Status';
+TEST $CLI volume set $V0 nfs.disable false
TEST $CLI volume start $V0;
EXPECT 'Started' volinfo_field $V0 'Status';
@@ -44,7 +40,7 @@ TEST $CLI volume quota $V0 hard-timeout 0
TEST $QDD $N0/$mydir/newfile_1 256 20
# wait for write behind to complete.
-EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "15.0MB" usage "/"
+EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "15.0MB" quotausage "/"
TEST ! $QDD $N0/$mydir/newfile_2 256 40
# Test rename within a directory. It should pass even when the
@@ -56,7 +52,6 @@ TEST ! mv $N0/dir/newfile_3 $N0/newdir/
umount_nfs $N0
TEST $CLI volume stop $V0
-EXPECT "1" get_aux
rm -f $QDD