From e95f93f3ef20a8f2f605c91e6d8c6eb2a4ce08cc Mon Sep 17 00:00:00 2001 From: Kevin Vigor Date: Thu, 5 Jan 2017 13:18:17 -0800 Subject: Repair mount-nfs-auth test for FB branch Summary: Test relied on rmtab setting to find NFS config dir, but in FB branch rmtab is disabled by default. Just hardcoded the location (test already contained hardcoded path, as it turns out). Test Plan: Reviewers: Subscribers: Tasks: Blame Revision: Change-Id: I4a50a00ed550832ca8d91981e6c5af4d8c81b466 Signed-off-by: Kevin Vigor Reviewed-on: http://review.gluster.org/16336 CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Shreyas Siravara Smoke: Gluster Build System --- tests/basic/mount-nfs-auth.t | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'tests/basic') diff --git a/tests/basic/mount-nfs-auth.t b/tests/basic/mount-nfs-auth.t index cd0189788ba..99f032cbd44 100755 --- a/tests/basic/mount-nfs-auth.t +++ b/tests/basic/mount-nfs-auth.t @@ -41,7 +41,7 @@ function build_dirs () { } function export_allow_this_host_ipv6 () { - printf "$EXPORT_ALLOW6\n" > /var/lib/glusterd/nfs/exports + printf "$EXPORT_ALLOW6\n" > ${NFSDIR}/exports } function export_allow_this_host () { @@ -157,10 +157,7 @@ setup_cluster TEST $CLI vol set $V0 nfs.disable off TEST $CLI vol start $V0 -# Get NFS state directory -NFSDIR=$( $CLI volume get patchy nfs.mount-rmtab | \ - awk '/^nfs.mount-rmtab/{print $2}' | \ - xargs dirname ) +NFSDIR=/var/lib/glusterd/nfs ## Wait for volume to register with rpc.mountd EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available -- cgit