From 8e980fb77aea3832e994955f366a1a4b57d204ee Mon Sep 17 00:00:00 2001 From: Alberto Date: Mon, 3 Oct 2011 18:18:53 +0100 Subject: Rearranging unit tests --- tests/01_regular_file_add_remove.sh | 29 +++++++++++++++++++++++++++++ tests/01_symlink_diff.sh | 29 ----------------------------- tests/02_fifo_diff.sh | 29 +++++++++++++++++++++++++++++ tests/02_symlink_add_remove.sh | 29 ----------------------------- tests/03_fifo_add_remove.sh | 29 +++++++++++++++++++++++++++++ tests/03_regular_file_add_remove.sh | 29 ----------------------------- tests/04_fifo_add_remove.sh | 29 ----------------------------- tests/04_symlink_diff.sh | 29 +++++++++++++++++++++++++++++ tests/05_symlink_add_remove.sh | 29 +++++++++++++++++++++++++++++ tests/run_tests.sh | 3 +++ 10 files changed, 148 insertions(+), 116 deletions(-) create mode 100755 tests/01_regular_file_add_remove.sh delete mode 100755 tests/01_symlink_diff.sh create mode 100755 tests/02_fifo_diff.sh delete mode 100755 tests/02_symlink_add_remove.sh create mode 100755 tests/03_fifo_add_remove.sh delete mode 100755 tests/03_regular_file_add_remove.sh delete mode 100755 tests/04_fifo_add_remove.sh create mode 100755 tests/04_symlink_diff.sh create mode 100755 tests/05_symlink_add_remove.sh (limited to 'tests') diff --git a/tests/01_regular_file_add_remove.sh b/tests/01_regular_file_add_remove.sh new file mode 100755 index 0000000..cdf3eab --- /dev/null +++ b/tests/01_regular_file_add_remove.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +TEST_ID="01" +TEST_NAME="Regular file add remove" + +CREATE=`pwd`/$1 +DEPLOY=`pwd`/$2 +TEST_TOOLS=$3 + +. ./test_lib.sh + +############# Test specific code ############ + +function setup { + touch $ORIGIN/remove && \ + echo 1 > $TARGET/add && \ + chown -h :cdrom $TARGET/add +} + +function check_results { + test -f $ORIGIN/add && \ + test ! -f $ORIGIN/remove && \ + check_content $ORIGIN/add "1" && \ + check_same_mtime $ORIGIN/add $TARGET/add && \ + check_same_uidgid $ORIGIN/add $TARGET/add +} + +############################################# +main $@ diff --git a/tests/01_symlink_diff.sh b/tests/01_symlink_diff.sh deleted file mode 100755 index 4181a30..0000000 --- a/tests/01_symlink_diff.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -TEST_ID="01" -TEST_NAME="Symlink add/remove" - -CREATE=`pwd`/$1 -DEPLOY=`pwd`/$2 -TEST_TOOLS=$3 - -. ./test_lib.sh - -############# Test specific code ############ - -function setup { - ln -s /foo $ORIGIN/a && \ - ln -s /bar $TARGET/a && \ - chown -h :cdrom $TARGET/a -} - -function check_results { - test -L $ORIGIN/a && \ - check_symlink $ORIGIN/a "/bar" && \ - check_group $ORIGIN/a cdrom && \ - check_same_mtime $ORIGIN/a $TARGET/a && \ - check_same_uidgid $ORIGIN/a $TARGET/a -} - -############################################# -main $@ diff --git a/tests/02_fifo_diff.sh b/tests/02_fifo_diff.sh new file mode 100755 index 0000000..0bf719e --- /dev/null +++ b/tests/02_fifo_diff.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +TEST_ID="02" +TEST_NAME="Named pipe (FIFO) add remove test" + +CREATE=`pwd`/$1 +DEPLOY=`pwd`/$2 +TEST_TOOLS=$3 + +. ./test_lib.sh + +############# Test specific code ############ + +function setup { + mkfifo $ORIGIN/remove && \ + mkfifo $TARGET/add && \ + chmod 707 $TARGET/add && \ + chown -h :cdrom $TARGET/add +} + +function check_results { + test -p $ORIGIN/add && \ + test ! -p $ORIGIN/remove && \ + check_same_mtime $ORIGIN/add $TARGET/add && \ + check_same_uidgid $ORIGIN/add $TARGET/add +} + +############################################# +main $@ diff --git a/tests/02_symlink_add_remove.sh b/tests/02_symlink_add_remove.sh deleted file mode 100755 index 6fe54d8..0000000 --- a/tests/02_symlink_add_remove.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -TEST_ID="03" -TEST_NAME="Symlink add/remove" - -CREATE=`pwd`/$1 -DEPLOY=`pwd`/$2 -TEST_TOOLS=$3 - -. ./test_lib.sh - -############# Test specific code ############ - -function setup { - ln -s /foo $ORIGIN/remove && \ - ln -s /bar $TARGET/add && \ - chown -h :cdrom $TARGET/add -} - -function check_results { - test -L $ORIGIN/add && \ - test ! -L $ORIGIN/remove && \ - check_symlink $ORIGIN/add "/bar" && \ - check_same_mtime $ORIGIN/add $TARGET/add && \ - check_same_uidgid $ORIGIN/add $TARGET/add -} - -############################################# -main $@ diff --git a/tests/03_fifo_add_remove.sh b/tests/03_fifo_add_remove.sh new file mode 100755 index 0000000..58ffa67 --- /dev/null +++ b/tests/03_fifo_add_remove.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +TEST_ID="03" +TEST_NAME="Named pipe (FIFO) add remove test" + +CREATE=`pwd`/$1 +DEPLOY=`pwd`/$2 +TEST_TOOLS=$3 + +. ./test_lib.sh + +############# Test specific code ############ + +function setup { + mkfifo $ORIGIN/remove && \ + mkfifo $TARGET/add && \ + chmod 707 $TARGET/add && \ + chown -h :cdrom $TARGET/add +} + +function check_results { + test -p $ORIGIN/add && \ + test ! -p $ORIGIN/remove && \ + check_same_mtime $ORIGIN/add $TARGET/add && \ + check_same_uidgid $ORIGIN/add $TARGET/add +} + +############################################# +main $@ diff --git a/tests/03_regular_file_add_remove.sh b/tests/03_regular_file_add_remove.sh deleted file mode 100755 index cdf3eab..0000000 --- a/tests/03_regular_file_add_remove.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -TEST_ID="01" -TEST_NAME="Regular file add remove" - -CREATE=`pwd`/$1 -DEPLOY=`pwd`/$2 -TEST_TOOLS=$3 - -. ./test_lib.sh - -############# Test specific code ############ - -function setup { - touch $ORIGIN/remove && \ - echo 1 > $TARGET/add && \ - chown -h :cdrom $TARGET/add -} - -function check_results { - test -f $ORIGIN/add && \ - test ! -f $ORIGIN/remove && \ - check_content $ORIGIN/add "1" && \ - check_same_mtime $ORIGIN/add $TARGET/add && \ - check_same_uidgid $ORIGIN/add $TARGET/add -} - -############################################# -main $@ diff --git a/tests/04_fifo_add_remove.sh b/tests/04_fifo_add_remove.sh deleted file mode 100755 index ebea443..0000000 --- a/tests/04_fifo_add_remove.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -TEST_ID="04" -TEST_NAME="Named pipe (FIFO) add remove test" - -CREATE=`pwd`/$1 -DEPLOY=`pwd`/$2 -TEST_TOOLS=$3 - -. ./test_lib.sh - -############# Test specific code ############ - -function setup { - mkfifo $ORIGIN/remove && \ - mkfifo $TARGET/add && \ - chmod 707 $TARGET/add && \ - chown -h :cdrom $TARGET/add -} - -function check_results { - test -p $ORIGIN/add && \ - test ! -p $ORIGIN/remove && \ - check_same_mtime $ORIGIN/add $TARGET/add && \ - check_same_uidgid $ORIGIN/add $TARGET/add -} - -############################################# -main $@ diff --git a/tests/04_symlink_diff.sh b/tests/04_symlink_diff.sh new file mode 100755 index 0000000..4b080cf --- /dev/null +++ b/tests/04_symlink_diff.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +TEST_ID="04" +TEST_NAME="Symlink add/remove" + +CREATE=`pwd`/$1 +DEPLOY=`pwd`/$2 +TEST_TOOLS=$3 + +. ./test_lib.sh + +############# Test specific code ############ + +function setup { + ln -s /foo $ORIGIN/a && \ + ln -s /bar $TARGET/a && \ + chown -h :cdrom $TARGET/a +} + +function check_results { + test -L $ORIGIN/a && \ + check_symlink $ORIGIN/a "/bar" && \ + check_group $ORIGIN/a cdrom && \ + check_same_mtime $ORIGIN/a $TARGET/a && \ + check_same_uidgid $ORIGIN/a $TARGET/a +} + +############################################# +main $@ diff --git a/tests/05_symlink_add_remove.sh b/tests/05_symlink_add_remove.sh new file mode 100755 index 0000000..147b8f0 --- /dev/null +++ b/tests/05_symlink_add_remove.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +TEST_ID="05" +TEST_NAME="Symlink add/remove" + +CREATE=`pwd`/$1 +DEPLOY=`pwd`/$2 +TEST_TOOLS=$3 + +. ./test_lib.sh + +############# Test specific code ############ + +function setup { + ln -s /foo $ORIGIN/remove && \ + ln -s /bar $TARGET/add && \ + chown -h :cdrom $TARGET/add +} + +function check_results { + test -L $ORIGIN/add && \ + test ! -L $ORIGIN/remove && \ + check_symlink $ORIGIN/add "/bar" && \ + check_same_mtime $ORIGIN/add $TARGET/add && \ + check_same_uidgid $ORIGIN/add $TARGET/add +} + +############################################# +main $@ diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 889f5f4..ca6501e 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -17,11 +17,14 @@ ALLTESTSDIR=`pwd` for i in [0-9][0-9]* do cd $ALLTESTSDIR + echo "#### Running $i" fakeroot -- ./$i ../tbdiff-create ../tbdiff-deploy if [ $? -ne 0 ] then echo "Test program $i failed" 1>&2 cd $ALLTESTSDIR + echo "-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-" exit 1 fi + echo "#####################################################################" done -- cgit v1.2.1