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/cdc.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/cdc.t')
-rwxr-xr-x | tests/basic/cdc.t | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/tests/basic/cdc.t b/tests/basic/cdc.t index be7d9a4ad0b..6a80b9287de 100755 --- a/tests/basic/cdc.t +++ b/tests/basic/cdc.t @@ -5,6 +5,11 @@ cleanup; +function file_mime_type () { + mime_type=$(file --mime $1 2>/dev/null | sed '/^[^:]*: /s///') + echo $mime_type +} + TEST glusterd TEST pidof glusterd @@ -44,7 +49,7 @@ EXPECT 'Started' volinfo_field $V0 'Status'; sleep 2 ## Mount FUSE with caching disabled -TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0; +TEST $GFS -s $H0 --volfile-id $V0 $M0; #################### ## Testing writev ## @@ -59,7 +64,15 @@ TEST dd if=/tmp/cdc-orig of=$M0/cdc-server count=1 bs=1k 2>/dev/null checksum[brick-file]=`md5sum $B0/${V0}1/cdc-server | cut -d' ' -f1` ## Uncompress the gzip dump file and find its md5sum -EXPECT '/tmp/cdcdump.gz: application/x-gzip; charset=binary' file -i /tmp/cdcdump.gz +# mime outputs for gzip are different for file version > 5.14 +TEST touch /tmp/gzipfile +TEST gzip /tmp/gzipfile +GZIP_MIME_TYPE=$(file_mime_type /tmp/gzipfile.gz) + +TEST rm -f /tmp/gzipfile.gz + +EXPECT "$GZIP_MIME_TYPE" echo $(file_mime_type /tmp/cdcdump.gz) + TEST gunzip -f /tmp/cdcdump.gz checksum[dump-file-writev]=`md5sum /tmp/cdcdump | cut -d' ' -f1` @@ -79,7 +92,9 @@ TEST dd if=$M0/cdc-server of=/tmp/cdc-client count=1 bs=1k 2>/dev/null checksum[client-file]=`md5sum /tmp/cdc-client | cut -d' ' -f1` ## Uncompress the gzip dump file and find its md5sum -EXPECT '/tmp/cdcdump.gz: application/x-gzip; charset=binary' file -i /tmp/cdcdump.gz +# mime outputs for gzip are different for file version > 5.14 +EXPECT "$GZIP_MIME_TYPE" echo $(file_mime_type /tmp/cdcdump.gz) + TEST gunzip -f /tmp/cdcdump.gz checksum[dump-file-readv]=`md5sum /tmp/cdcdump | cut -d' ' -f1` @@ -106,7 +121,7 @@ TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status'; ## Mount FUSE with caching disabled -TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0; +TEST $GFS -s $H0 --volfile-id $V0 $M0; ## Create a file of size 99 bytes on mountpoint ## This is should not be compressed |