Adjust unit tests

Author: RoyWFHuang

script/config

@@ -0,0 +1,10 @@
+D_MOD="drwxr-xr-x"
+F_MOD="-rw-r--r--"
+S_MOD="lrwxrwxrwx"
+SIMPLEFS_MAX_BLOCKS_PER_EXTENT=8
+SIMPLEFS_BLOCK_SIZE=4096
+SIMPLEFS_MAX_EXTENTS=$(( ($SIMPLEFS_BLOCK_SIZE - 4) / 16 ))
+MAXFILESIZE=$(( $SIMPLEFS_MAX_EXTENTS * $SIMPLEFS_MAX_BLOCKS_PER_EXTENT * $SIMPLEFS_BLOCK_SIZE ))
+# MAXFILES=1173           # max files per dir
+MAXFILES=30600        # max files per dir
+MOUNT_TEST=100

script/test.sh

@@ -1,36 +1,15 @@
 #!/usr/bin/env bash
 
+. script/test_func.sh
 . script/test_large_file.sh
+. script/test_remount.sh
+. script/config
 
 SIMPLEFS_MOD=simplefs.ko
 IMAGE=$1
 IMAGESIZE=$2
 MKFS=$3
 
-D_MOD="drwxr-xr-x"
-F_MOD="-rw-r--r--"
-S_MOD="lrwxrwxrwx"
-MAXFILESIZE=11173888 # SIMPLEFS_MAX_EXTENTS * SIMPLEFS_MAX_BLOCKS_PER_EXTENT * SIMPLEFS_BLOCK_SIZE
-MAXFILES=40920        # max files per dir
-MOUNT_TEST=100
-
-test_op() {
-    local op=$1
-    echo
-    echo -n "Testing cmd: $op..."
-    sudo sh -c "$op" >/dev/null && echo "Success"
-}
-
-check_exist() {
-    local mode=$1
-    local nlink=$2
-    local name=$3
-    echo
-    echo -n "Check if exist: $mode $nlink $name..."
-    sudo ls -lR  | grep -e "$mode $nlink".*$name >/dev/null && echo "Success" || \
-    echo "Failed"
-}
-
 if [ "$EUID" -eq 0 ]
   then echo "Don't run this script as root"
   exit
@@ -46,62 +25,32 @@ echo && \
 sudo insmod $SIMPLEFS_MOD  && \
 dd if=/dev/zero of=$IMAGE bs=1M count=$IMAGESIZE status=none && \
 ./$MKFS $IMAGE && \
+
 sudo mount -t simplefs -o loop $IMAGE test && \
 pushd test >/dev/null
 
-# create 40920 files
-for ((i=0; i<=$MAXFILES; i++))
-do
-    test_op "touch $i.txt" # expected to fail with more than 40920 files
-done
-filecnts=$(ls | wc -w)
-test $filecnts -eq $MAXFILES || echo "Failed, it should be $MAXFILES files"
-find . -name '[0-9]*.txt' | xargs -n 2000 sudo rm
-sync
-
-# create 100 files with filenames inside
-for ((i=1; i<=$MOUNT_TEST; i++))
-do
-    echo file_$i | sudo tee file_$i.txt >/dev/null && echo "file_$i.txt created."
-done
-sync
+# test serial to write
+test_create_max_nr_files
+# test remount file exist or not
+test_remount_file_exist
 
-# unmount and remount the filesystem
-echo "Unmounting filesystem..."
 popd >/dev/null || { echo "popd failed"; exit 1; }
-sudo umount test || { echo "umount failed"; exit 1; }
-sleep 1
-echo "Remounting filesystem..."
-sudo mount -t simplefs -o loop $IMAGE test || { echo "mount failed"; exit 1; }
-echo "Remount succeeds."
-pushd test >/dev/null || { echo "pushd failed"; exit 1; }
 
-# check if files exist and content is correct after remounting
-for ((i=1; i<=$MOUNT_TEST; i++))
-do
-    if [[ -f "file_$i.txt" ]]; then
-        content=$(cat "file_$i.txt" | tr -d '\000')
-        if [[ "$content" == "file_$i" ]]; then
-            echo "Success: file_$i.txt content is correct."
-        else
-            echo "Failed: file_$i.txt content is incorrect."
-            exit 1
-        fi
-    else
-        echo "Failed: file_$i.txt does not exist."
-        exit 1
-    fi
-done
-find . -name 'file_[0-9]*.txt' | xargs sudo rm || { echo "Failed to delete files"; exit 1; }
+# Get ready to count free block
+sudo touch test/test.txt
+sudo rm test/* -rf
 sync
 
-popd >/dev/null || { echo "popd failed"; exit 1; }
-ls test -laR
-rm test/* -rf
 nr_free_blk=$(($(dd if=$IMAGE bs=1 skip=28 count=4 2>/dev/null | hexdump -v -e '1/4 "0x%08x\n"')))
 echo "$nr_free_blk"
 pushd test >/dev/null || { echo "pushd failed"; exit 1; }
 
+# write a file larger than max size
+test_too_large_file
+
+# Write the a file larger than BLOCK_SIZE
+test_file_size_larger_than_block_size
+
 # mkdir
 test_op 'mkdir dir'
 test_op 'mkdir dir' # expected to fail
@@ -128,13 +77,6 @@ test_op 'ln -s dir len_of_name_of_the_link_is_29'
 test_op 'echo abc > file'
 test $(cat file) = "abc" || echo "Failed to write"
 
-# file too large
-test_too_large_file
-
-# Write the file size larger than BLOCK_SIZE
-# test serial to write
-test_file_size_larger_than_block_size
-
 # test remove symbolic link
 test_op 'ln -s file symlink_fake'
 test_op 'rm -f symlink_fake'

script/test_func.sh

@@ -0,0 +1,16 @@
+test_op() {
+    local op=$1
+    echo
+    echo -n "Testing cmd: $op..."
+    sudo sh -c "$op" >/dev/null && echo "Success"
+}
+
+check_exist() {
+    local mode=$1
+    local nlink=$2
+    local name=$3
+    echo
+    echo -n "Check if exist: $mode $nlink $name..."
+    sudo ls -lR  | grep -e "$mode $nlink".*$name >/dev/null && echo "Success" || \
+    echo "Failed"
+}

script/test_large_file.sh

@@ -1,20 +1,23 @@
 # file too large
 test_too_large_file() {
-    test_op 'dd if=/dev/zero of=file bs=1M count=12 status=none'
-    filesize=$(sudo ls -lR  | grep -e "$F_MOD 2".*file | awk '{print $5}')
+    TESTLG_FILE_SZ=$(( $MAXFILESIZE / 1024 / 1024 + 1 ))
+    test_op "dd if=/dev/zero of=exceed_max_sz_file bs=1M count=$TESTLG_FILE_SZ status=none"
+    filesize=$(sudo ls -lR  | grep -e "$F_MOD 1".*file | awk '{print $5}')
     test $filesize -le $MAXFILESIZE || echo "Failed, file size over the limit"
+    test_op 'rm exceed_max_sz_file'
 }
 
 # Write the file size larger than BLOCK_SIZE
 # test serial to write
 test_file_size_larger_than_block_size() {
-    test_op 'yes 123456789 | head -n 1600 | tr -d "\n" > file.txt'
-    count=$(awk '{count += gsub(/123456789/, "")} END {print count}' "file.txt")
+    test_op 'yes 123456789 | head -n 1600 | tr -d "\n" > exceed_blk.txt'
+    count=$(awk '{count += gsub(/123456789/, "")} END {print count}' "exceed_blk.txt")
     echo "test $count"
     test "$count" -eq 1600 || echo "Failed, file size not matching"
     # test block to write
-    test_op 'cat file.txt > checkfile.txt'
+    test_op 'cat exceed_blk.txt > checkfile.txt'
     count=$(awk '{count += gsub(/123456789/, "")} END {print count}' "checkfile.txt")
     echo "test $count"
     test "$count" -eq 1600 || echo "Failed, file size not matching"
+    test_op 'rm exceed_blk.txt checkfile.txt'
 }

script/test_remount.sh

@@ -0,0 +1,52 @@
+# test create max nr files
+test_create_max_nr_files() {
+    echo "max size $MAXFILESIZE"
+    # create 40920 files
+    for ((i=0; i<=$MAXFILES; i++))
+    do
+        test_op "touch $i.txt" # expected to fail with more than 40920 files
+    done
+    sync
+    filecnts=$(ls | wc -w)
+    test $filecnts -eq $MAXFILES || echo "Failed($filecnts), it should be $MAXFILES files"
+    find . -name '[0-9]*.txt' | xargs -n 2000 sudo rm
+    sync
+}
+
+# create 100 files with filenames inside
+test_remount_file_exist() {
+    for ((i=1; i<=$MOUNT_TEST; i++))
+    do
+        echo file_$i | sudo tee file_$i.txt >/dev/null && echo "file_$i.txt created."
+    done
+    sync
+
+    # unmount and remount the filesystem
+    echo "Unmounting filesystem..."
+    popd >/dev/null || { echo "popd failed"; exit 1; }
+    sudo umount test || { echo "umount failed"; exit 1; }
+    sleep 1
+    echo "Remounting filesystem..."
+    sudo mount -t simplefs -o loop $IMAGE test || { echo "mount failed"; exit 1; }
+    echo "Remount succeeds."
+    pushd test >/dev/null || { echo "pushd failed"; exit 1; }
+
+    # check if files exist and content is correct after remounting
+    for ((i=1; i<=$MOUNT_TEST; i++))
+    do
+        if [[ -f "file_$i.txt" ]]; then
+            content=$(cat "file_$i.txt" | tr -d '\000')
+            if [[ "$content" == "file_$i" ]]; then
+                echo "Success: file_$i.txt content is correct."
+            else
+                echo "Failed: file_$i.txt content is incorrect."
+                exit 1
+            fi
+        else
+            echo "Failed: file_$i.txt does not exist."
+            exit 1
+        fi
+    done
+    find . -name 'file_[0-9]*.txt' | xargs sudo rm || { echo "Failed to delete files"; exit 1; }
+    sync
+}