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/ec/nfs.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/ec/nfs.t')
| -rw-r--r-- | tests/basic/ec/nfs.t | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/basic/ec/nfs.t b/tests/basic/ec/nfs.t index b2e51c03af5..ebc8f9fcbce 100644 --- a/tests/basic/ec/nfs.t +++ b/tests/basic/ec/nfs.t @@ -11,11 +11,11 @@ TEST $CLI volume create $V0 redundancy 2 $H0:$B0/${V0}{0..5} TEST $CLI volume start $V0 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available; -TEST mount_nfs $H0:/$V0 $N0 +TEST mount_nfs $H0:/$V0 $N0 nolock TEST dd if=/dev/zero of=$N0/test bs=1024k count=1k ## Before killing daemon to avoid deadlocks -EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0 cleanup |