summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVijay Bellur <vbellur@redhat.com>2016-04-08 21:59:53 -0400
committerPranith Kumar Karampuri <pkarampu@redhat.com>2016-04-09 12:00:30 -0700
commit09c9da3b12da73dd718522fdf7587d3be5a14137 (patch)
tree55fb4e4a4503f6c35932c84473eb5677cc556c8b /tests
parent5ff451beecaf564b4f854b10e63a307e40660c8c (diff)
extras: Add namespace for options in group-virt.example
Commit 23ccabbeb7 introduced a new key "disperse.eager-lock" which causes a conflict with key "cluster.eager-lock" when option is used without the qualifying namespace. group-virt.example which gets installed as /var/lib/glusterd/ groups/virt contains options without namespace qualifiers. This patch adds the appropriate namespace to all options in group-virt.example. Change-Id: I2c09dd10d44138410d889ddeb805f01c641c6780 BUG: 1314649 Signed-off-by: Vijay Bellur <vbellur@redhat.com> Reviewed-on: http://review.gluster.org/13929 Smoke: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/bugs/glusterd/bug-1314649-group-virt.t14
-rw-r--r--tests/include.rc5
2 files changed, 17 insertions, 2 deletions
diff --git a/tests/bugs/glusterd/bug-1314649-group-virt.t b/tests/bugs/glusterd/bug-1314649-group-virt.t
new file mode 100644
index 00000000000..257e7845611
--- /dev/null
+++ b/tests/bugs/glusterd/bug-1314649-group-virt.t
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+
+cleanup;
+
+TEST glusterd
+
+TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8};
+
+TEST $CLI volume set $V0 group virt;
+
+cleanup;
diff --git a/tests/include.rc b/tests/include.rc
index 6f224833bf9..2beb4e676af 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -512,11 +512,12 @@ function cleanup()
;;
esac
- # remove contents of "GLUSTERD_WORKDIR" except hooks directory.
+ # remove contents of "GLUSTERD_WORKDIR" except hooks and groups
+ # directories.
if [ -n $GLUSTERD_WORKDIR ]
then
find $GLUSTERD_WORKDIR/* -maxdepth 0 -name 'hooks' -prune \
- -o -exec rm -rf '{}' ';'
+ -o -name 'groups' -prune -o -exec rm -rf '{}' ';'
else
echo "GLUSTERD_WORKDIR is not set"
fi