summaryrefslogtreecommitdiffstats
path: root/tests/basic/volume-status.t
diff options
context:
space:
mode:
authorHarshavardhana <harsha@harshavardhana.net>2014-08-19 18:24:23 -0700
committerHarshavardhana <harsha@harshavardhana.net>2014-08-29 09:13:02 -0700
commit2dd53eb4de91c25817af85475cfa9ff66e79c97b (patch)
tree1fce885b03af9a07d797dfac92f9ecd24817617e /tests/basic/volume-status.t
parent04be6a47df5c7d5c04c84fed06df9a8a1652c582 (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/volume-status.t')
-rw-r--r--tests/basic/volume-status.t3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/basic/volume-status.t b/tests/basic/volume-status.t
index 9b636cfa936..41c0ceeaebe 100644
--- a/tests/basic/volume-status.t
+++ b/tests/basic/volume-status.t
@@ -17,7 +17,7 @@ TEST $CLI volume start $V0;
sleep 2
## Mount FUSE
-TEST glusterfs -s $H0 --volfile-id $V0 $M0;
+TEST $GFS -s $H0 --volfile-id $V0 $M0;
## Mount NFS
TEST mount_nfs $H0:/$V0 $N0 nolock;
@@ -68,4 +68,3 @@ TEST test_brick_cmds;
EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
cleanup;
-