Merge pull request #1134 from gaul/test/size

Verify file size via metadata as well as data

test/integration-test-main.sh

@@ -7,21 +7,15 @@ source test-utils.sh
 
 function test_append_file {
     describe "Testing append to file ..."
+    TEST_INPUT="echo ${TEST_TEXT} to ${TEST_TEXT_FILE}"
 
     # Write a small test file
     for x in `seq 1 $TEST_TEXT_FILE_LENGTH`
     do
-       echo "echo ${TEST_TEXT} to ${TEST_TEXT_FILE}"
+        echo $TEST_INPUT
     done > ${TEST_TEXT_FILE}
 
-    # Verify contents of file
+    check_file_size "${TEST_TEXT_FILE}" $(($TEST_TEXT_FILE_LENGTH * $(echo $TEST_INPUT | wc -c)))
-    echo "Verifying length of test file"
-    FILE_LENGTH=`wc -l $TEST_TEXT_FILE | awk '{print $1}'`
-    if [ "$FILE_LENGTH" -ne "$TEST_TEXT_FILE_LENGTH" ]
-    then
-       echo "error: expected $TEST_TEXT_FILE_LENGTH , got $FILE_LENGTH"
-       return 1
-    fi
 
     rm_test_file
 }
@@ -34,12 +28,8 @@ function test_truncate_file {
     # Truncate file to 0 length.  This should trigger open(path, O_RDWR | O_TRUNC...)
     : > ${TEST_TEXT_FILE}
 
-    # Verify file is zero length
+    check_file_size "${TEST_TEXT_FILE}" 0
-    if [ -s ${TEST_TEXT_FILE} ]
+
-    then
-        echo "error: expected ${TEST_TEXT_FILE} to be zero length"
-        return 1
-    fi
     rm_test_file
 }
 
@@ -52,17 +42,8 @@ function test_truncate_empty_file {
     t_size=1024
     truncate ${TEST_TEXT_FILE} -s $t_size
 
-    # Verify file is zero length
+    check_file_size "${TEST_TEXT_FILE}" $t_size
-    if [ `uname` = "Darwin" ]; then
+
-        size=$(stat -f "%z" ${TEST_TEXT_FILE})
-    else
-        size=$(stat -c %s ${TEST_TEXT_FILE})
-    fi
-    if [ $t_size -ne $size ]
-    then
-        echo "error: expected ${TEST_TEXT_FILE} to be $t_size length, got $size"
-        return 1
-    fi
     rm_test_file
 }
 

test/test-utils.sh

@@ -45,6 +45,35 @@ function del_xattr() {
     fi
 }
 
+function get_size() {
+    if [ `uname` = "Darwin" ]; then
+        stat -f "%z" "$1"
+    else
+        stat -c %s "$1"
+    fi
+}
+
+function check_file_size() {
+    FILE_NAME="$1"
+    EXPECTED_SIZE="$2"
+
+    # Verify file is zero length via metadata
+    size=$(get_size ${FILE_NAME})
+    if [ $size -ne $EXPECTED_SIZE ]
+    then
+        echo "error: expected ${FILE_NAME} to be zero length"
+        return 1
+    fi
+
+    # Verify file is zero length via data
+    size=$(cat ${FILE_NAME} | wc -c)
+    if [ $size -ne $EXPECTED_SIZE ]
+    then
+        echo "error: expected ${FILE_NAME} to be $EXPECTED_SIZE length, got $size"
+        return 1
+    fi
+}
+
 function mk_test_file {
     if [ $# == 0 ]; then
         TEXT=$TEST_TEXT