diff options
| author | Emmanuel Dreyfus <manu@netbsd.org> | 2014-08-19 17:55:46 +0200 |
|---|---|---|
| committer | Harshavardhana <harsha@harshavardhana.net> | 2014-08-20 13:41:08 -0700 |
| commit | 473f115cbf18dd5229636c817d49b2c60471e227 (patch) | |
| tree | 7c0f2c6c239600024ea8e28acf53c72315d48539 /tests/basic/quota.t | |
| parent | 22d5361cec8ec2a101e0896a9642a995122ffad3 (diff) | |
Regression test portability: mount
Address various portability-related problems related to mount
- In order to address the non-portability of NFS mount options,
use the mount_nfs shell function everywhere, and use it to
translate options.
- Make sure NFS mounts are unmounted before shutting down the
daemons in order to avoid deadlock. The change is done in every
test that did not unmounted NFS mounts at the end of the script,
and in global cleanup function as well. The force_umount shell
function from volume.rc was duplicated as umount_nfs in nfs.rc
so that we do not have to add an include on volume.rc for all
NFS tests that do not need it.
- The FUSE mount type on NetBSD is puffs|perfuse|fuse.glusterfs
instead of just fuse.glusterfs, make the regexp configurable
in include.rc
- Finding wether the mount is RO or RW in mount output needs
a system-dependent command configurable in include.rc
- mount options in /proc/mounts may be limited to "rw", adjust
the regexp for this case where there is no comma
And while there change rm into rm -f in tests/basic/mount.t
for removal opearation that should fail, since rm may ask
for confirmation
Change-Id: I1fb708486ec350b2885e2404879561c1020fa8fd
BUG: 1129939
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/8494
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
Tested-by: Harshavardhana <harsha@harshavardhana.net>
Diffstat (limited to 'tests/basic/quota.t')
| -rwxr-xr-x | tests/basic/quota.t | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/basic/quota.t b/tests/basic/quota.t index 2fef251e485..1d23cfc8688 100755 --- a/tests/basic/quota.t +++ b/tests/basic/quota.t @@ -2,6 +2,7 @@ . $(dirname $0)/../include.rc . $(dirname $0)/../volume.rc +. $(dirname $0)/../nfs.rc . $(dirname $0)/../dht.rc cleanup; @@ -97,7 +98,7 @@ EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0Bytes" usage "/test_dir" # though this may change. ## ----------------------------- -TEST mount -t nfs -o nolock,soft,intr $H0:/$V0 $N0; +TEST mount_nfs $H0:/$V0 $N0 nolock; TEST $CLI volume quota $V0 limit-usage /test_dir 100MB TEST $CLI volume quota $V0 limit-usage /test_dir/in_test_dir 150MB |