summaryrefslogtreecommitdiffstats
path: root/tests/features
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/features
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/features')
-rwxr-xr-xtests/features/readdir-ahead.t2
-rwxr-xr-xtests/features/ssl-authz.t2
-rwxr-xr-xtests/features/weighted-rebalance.t2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/features/readdir-ahead.t b/tests/features/readdir-ahead.t
index 2b2a2fb5644..6c09ee41208 100755
--- a/tests/features/readdir-ahead.t
+++ b/tests/features/readdir-ahead.t
@@ -17,7 +17,7 @@ TEST $CLI volume start $V0
TEST $CLI volume set $V0 readdir-ahead on
-TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0
+TEST $GFS --volfile-id=$V0 --volfile-server=$H0 $M0
TEST mkdir $M0/test
for i in $(seq 0 99)
diff --git a/tests/features/ssl-authz.t b/tests/features/ssl-authz.t
index f6c56bcaa53..fa241907b9f 100755
--- a/tests/features/ssl-authz.t
+++ b/tests/features/ssl-authz.t
@@ -44,7 +44,7 @@ TEST $CLI volume start $V0
# This mount should FAIL because the identity given by our certificate does not
# match the allowed user. In other words, authentication works (they know who
# we are) but authorization doesn't (we're not the right person).
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0
+TEST $GFS --volfile-server=$H0 --volfile-id=$V0 $M0
# Looks like /*/bin/glusterfs isn't returning error status correctly (again).
# Actually try doing something to get a real error.
diff --git a/tests/features/weighted-rebalance.t b/tests/features/weighted-rebalance.t
index 40098624deb..5bd858b4c4c 100755
--- a/tests/features/weighted-rebalance.t
+++ b/tests/features/weighted-rebalance.t
@@ -62,7 +62,7 @@ TEST $CLI volume start $V0
EXPECT 'Started' volinfo_field $V0 'Status'
# Create some files for later tests.
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0
+TEST $GFS -s $H0 --volfile-id $V0 $M0
TEST mkdir $M0/dir
TEST touch_files
TEST umount $M0