summaryrefslogtreecommitdiffstats
path: root/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t
diff options
context:
space:
mode:
authorKaleb S KEITHLEY <kkeithle@redhat.com>2016-03-15 06:16:31 -0400
committerNiels de Vos <ndevos@redhat.com>2016-04-27 00:59:30 -0700
commita4f84d786b596387aa0d659fb5cc8a933c95c01b (patch)
tree85e0f319cf0405a632c5a268dfb25407c054dba8 /tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t
parent3c35329feb4dd479c9e4856ee27fa4b12c708db2 (diff)
glusterd: default value of nfs.disable, change from false to true
Next step in eventual deprecation of glusterfs nfs server in favor of ganesha.nfsd. Also replace several open-coded strings with constant. Change-Id: If52f5e880191a14fd38e69b70a32b0300dd93a50 BUG: 1092414 Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/13738 NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Atin Mukherjee <amukherj@redhat.com> Tested-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t')
-rw-r--r--tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t14
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t b/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t
index 4ef4c9d14ad..4798959380e 100644
--- a/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t
+++ b/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t
@@ -19,23 +19,25 @@ TEST $CLI volume create $V0 $H0:$B0/${V0}{1..2}
TEST $CLI volume start $V0
## Perform attach-tier operation on volume $V0
-TEST $CLI volume attach-tier $V0 $H0:$B0/${V0}{3..4}
+TEST $CLI volume tier $V0 attach $H0:$B0/${V0}{3..4}
## detach-tier commit operation without force option on volume $V0
## should not succeed
-TEST ! $CLI volume detach-tier $V0 commit
+TEST ! $CLI --mode=script volume tier $V0 detach commit
## detach-tier commit operation with force option on volume $V0
## should succeed
-TEST $CLI volume detach-tier $V0 force
+TEST $CLI volume tier $V0 detach force
+
+sleep 3
## Again performing attach-tier operation on volume $V0
-TEST $CLI volume attach-tier $V0 $H0:$B0/${V0}{5..6}
+TEST $CLI volume tier $V0 attach $H0:$B0/${V0}{5..6}
## Do detach-tier start on volume $V0
-TEST $CLI volume detach-tier $V0 start
+TEST $CLI volume tier $V0 detach start
## Now detach-tier commit on volume $V0 should succeed.
-TEST $CLI volume detach-tier $V0 commit
+TEST $CLI volume tier $V0 detach commit
cleanup;