diff options
| author | Kaleb S KEITHLEY <kkeithle@redhat.com> | 2016-03-15 06:16:31 -0400 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2016-04-27 00:59:30 -0700 |
| commit | a4f84d786b596387aa0d659fb5cc8a933c95c01b (patch) | |
| tree | 85e0f319cf0405a632c5a268dfb25407c054dba8 /tests/bugs/distribute | |
| parent | 3c35329feb4dd479c9e4856ee27fa4b12c708db2 (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/distribute')
| -rwxr-xr-x | tests/bugs/distribute/bug-1125824.t | 1 | ||||
| -rwxr-xr-x | tests/bugs/distribute/bug-1161156.t | 1 | ||||
| -rw-r--r-- | tests/bugs/distribute/bug-1190734.t | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/tests/bugs/distribute/bug-1125824.t b/tests/bugs/distribute/bug-1125824.t index a944b360db3..3bafbf31fe5 100755 --- a/tests/bugs/distribute/bug-1125824.t +++ b/tests/bugs/distribute/bug-1125824.t @@ -54,6 +54,7 @@ EXPECT "$V0" volinfo_field $V0 'Volume Name'; EXPECT 'Created' volinfo_field $V0 'Status'; EXPECT '4' brick_count $V0 +TEST $CLI volume set $V0 nfs.disable false TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status'; diff --git a/tests/bugs/distribute/bug-1161156.t b/tests/bugs/distribute/bug-1161156.t index 572338a2257..44a234c60dc 100755 --- a/tests/bugs/distribute/bug-1161156.t +++ b/tests/bugs/distribute/bug-1161156.t @@ -17,6 +17,7 @@ TEST $CLI volume info; TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2,3,4,5,6}; EXPECT 'Created' volinfo_field $V0 'Status'; +TEST $CLI volume set $V0 nfs.disable false TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status'; diff --git a/tests/bugs/distribute/bug-1190734.t b/tests/bugs/distribute/bug-1190734.t index ae34ec84729..d48d74d2c35 100644 --- a/tests/bugs/distribute/bug-1190734.t +++ b/tests/bugs/distribute/bug-1190734.t @@ -62,6 +62,7 @@ TEST pidof glusterd TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}0 $H0:$B0/${V0}1 \ $H0:$B0/${V0}2 $H0:$B0/${V0}3 $H0:$B0/${V0}4 $H0:$B0/${V0}5 +TEST $CLI volume set $V0 nfs.disable false # ------- test 1: AFR, fuse + remove bricks @@ -77,6 +78,7 @@ reset $M0 TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}0 $H0:$B0/${V0}1 \ $H0:$B0/${V0}2 $H0:$B0/${V0}3 $H0:$B0/${V0}4 $H0:$B0/${V0}5 +TEST $CLI volume set $V0 nfs.disable false TEST start_mount_nfs test2 EXPECT_WITHIN $FILE_COUNT_TIME $FILE_COUNT get_file_count $N0/test2 |