summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManikandan Selvaganesh <mselvaga@redhat.com>2016-01-12 16:38:27 +0530
committerVijay Bellur <vbellur@redhat.com>2016-01-12 10:26:14 -0800
commitae165bd6d7c3a0130984cbd927be318146c7bbdd (patch)
tree1c5c2a2fac2a5edee18144945a49e9bf58a9f1f6
parent2b2294d2a4ef221fccb6eb9f74e9b7dc233b9f1d (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>". 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>
-rw-r--r--tests/volume.rc2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/volume.rc b/tests/volume.rc
index 818f83da99b..986d8dac15f 100644
--- a/tests/volume.rc
+++ b/tests/volume.rc
@@ -550,7 +550,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