diff options
| author | Harshavardhana <harsha@harshavardhana.net> | 2014-08-19 18:24:23 -0700 |
|---|---|---|
| committer | Harshavardhana <harsha@harshavardhana.net> | 2014-08-29 09:13:02 -0700 |
| commit | 2dd53eb4de91c25817af85475cfa9ff66e79c97b (patch) | |
| tree | 1fce885b03af9a07d797dfac92f9ecd24817617e /tests/basic/mount.t | |
| parent | 04be6a47df5c7d5c04c84fed06df9a8a1652c582 (diff) | |
porting: various fixes regression tests OSX/FreeBSD
- `wc -l` on OSX/FreeBSD adds spurious spaces, this clobbers
up TAP output parsers - fix it.
- `umount -l` doesn't exist on OSX/FreeBSD use 'umount -f' if
available.
- Add check for 'file' version, to handle mime type variations
across versions
- Converge 'glusterfs --attribute-timeout=0 --entry-timeout=0'
into '$GFS'
- Modify remaining 'mount -t nfs' to use 'mount_nfs'
- Update sha1sum for OSX to use 'openssl sha1'.
Change-Id: Id1012faa5d67a921513d220e7fa9cebafe830d34
BUG: 1131713
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-on: http://review.gluster.org/8501
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'tests/basic/mount.t')
| -rwxr-xr-x | tests/basic/mount.t | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/basic/mount.t b/tests/basic/mount.t index d67bc8ab998..47d0efe3908 100755 --- a/tests/basic/mount.t +++ b/tests/basic/mount.t @@ -36,14 +36,14 @@ EXPECT 'Started' volinfo_field $V0 'Status'; TEST $CLI volume set $V0 performance.stat-prefetch off; ## Mount FUSE with caching disabled (read-write) -TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0; +TEST $GFS -s $H0 --volfile-id $V0 $M0; ## Check consistent "rw" option TEST 'mount -t $MOUNT_TYPE_FUSE | grep -E "^$H0:$V0 "|$GREP_MOUNT_OPT_RW'; TEST 'grep -E "^$H0:$V0 .+ ,?rw,?" /proc/mounts'; ## Mount FUSE with caching disabled (read-only) -TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --read-only -s $H0 --volfile-id $V0 $M1; +TEST $GFS --read-only -s $H0 --volfile-id $V0 $M1; ## Check consistent "ro" option TEST 'mount -t $MOUNT_TYPE_FUSE | grep -E "^$H0:$V0 "|$GREP_MOUNT_OPT_RO'; @@ -55,7 +55,6 @@ EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available; ## Mount NFS TEST mount_nfs $H0:/$V0 $N0 nolock; - ## Test for consistent views between NFS and FUSE mounts ## write access to $M1 should fail TEST ! stat $M0/newfile; |