summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorManikandan Selvaganesh <mselvaga@redhat.com>2016-01-12 16:38:27 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2016-01-27 21:16:06 -0800
commita816cc5124951a2cbe57d2bd95b6690e766c57a7 (patch)
treee13b065dda0e28ce99efefea7f4f22bcb4261ea4 /tests
parent1643209297664462ffabc04a4fe667f2fb9be741 (diff)
tests/quota : fix failing test on auxiliary mount point
In test file tests/bugs/quota/bug-1049323.t, test "EXPECT "0" get_aux" fails in Fedora. In get_aux function we grep for "/var/run/gluster/<volname>" to check if auxiliary mount point is created and we return 0 on success else we return 1. In fedora, auxiliary mount point is created on "/run/gluster/<volname>". So it fails on Fedora. The patch fixes it by just grepping for "/run/gluster/<volname>". Backport of http://review.gluster.org/#/c/13228/ > Change-Id: Icb59395df4a98109eaa8199cbdbdedcd1cbef27a > BUG: 1297740 > Signed-off-by: Manikandan Selvaganesh <mselvaga@redhat.com> > Reviewed-on: http://review.gluster.org/13228 > Reviewed-by: Niels de Vos <ndevos@redhat.com> > Reviewed-by: Raghavendra Talur <rtalur@redhat.com> > Tested-by: NetBSD Build System <jenkins@build.gluster.org> Change-Id: Icb59395df4a98109eaa8199cbdbdedcd1cbef27a BUG: 1300600 Signed-off-by: Manikandan Selvaganesh <mselvaga@redhat.com> Reviewed-on: http://review.gluster.org/13273 Smoke: Gluster Build System <jenkins@build.gluster.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/volume.rc2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/volume.rc b/tests/volume.rc
index 8724c08d249..9bd9eca1ec5 100644
--- a/tests/volume.rc
+++ b/tests/volume.rc
@@ -547,7 +547,7 @@ function num_graphs
function get_aux()
{
##Check if a auxiliary mount is there
-df -h 2>&1 | grep "/var/run/gluster/$V0" -
+df -h 2>&1 | grep -e "[[:space:]]/run/gluster/${V0}$" -e "[[:space:]]/var/run/gluster/${V0}$" -
if [ $? -eq 0 ]
then