From 6695045aa6da08d572363fe14c7c7565c7bfcb9b Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Mon, 4 Nov 2013 10:11:13 +0000 Subject: Conversion of tbdiff directory tests Disabled (renamed) old tests that have been converted Removed compilation instruction for symtime.c from README --- tests/00_regular_file_diff.sh | 40 ---------------------- tests/01_regular_file_add_remove.sh | 32 ----------------- tests/02_fifo_diff.sh | 32 ----------------- tests/03_fifo_add_remove.sh | 32 ----------------- tests/04_symlink_diff.sh | 57 ------------------------------- tests/05_symlink_add_remove.sh | 48 -------------------------- tests/06_dir_diff.sh | 40 ---------------------- tests/07_dir_add_remove.sh | 41 ---------------------- tests/dir_add_remove.sh.disabled | 41 ++++++++++++++++++++++ tests/dir_diff.sh.disabled | 40 ++++++++++++++++++++++ tests/fifo_add_remove.sh.disabled | 32 +++++++++++++++++ tests/fifo_diff.sh.disabled | 32 +++++++++++++++++ tests/regular_file_add_remove.sh.disabled | 32 +++++++++++++++++ tests/regular_file_diff.sh.disabled | 40 ++++++++++++++++++++++ tests/symlink_add_remove.sh.disabled | 48 ++++++++++++++++++++++++++ tests/symlink_diff.sh.disabled | 57 +++++++++++++++++++++++++++++++ 16 files changed, 322 insertions(+), 322 deletions(-) delete mode 100755 tests/00_regular_file_diff.sh delete mode 100755 tests/01_regular_file_add_remove.sh delete mode 100755 tests/02_fifo_diff.sh delete mode 100755 tests/03_fifo_add_remove.sh delete mode 100755 tests/04_symlink_diff.sh delete mode 100755 tests/05_symlink_add_remove.sh delete mode 100755 tests/06_dir_diff.sh delete mode 100755 tests/07_dir_add_remove.sh create mode 100755 tests/dir_add_remove.sh.disabled create mode 100755 tests/dir_diff.sh.disabled create mode 100755 tests/fifo_add_remove.sh.disabled create mode 100755 tests/fifo_diff.sh.disabled create mode 100755 tests/regular_file_add_remove.sh.disabled create mode 100755 tests/regular_file_diff.sh.disabled create mode 100755 tests/symlink_add_remove.sh.disabled create mode 100755 tests/symlink_diff.sh.disabled (limited to 'tests') diff --git a/tests/00_regular_file_diff.sh b/tests/00_regular_file_diff.sh deleted file mode 100755 index 0e12454..0000000 --- a/tests/00_regular_file_diff.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -TEST_ID="00" -TEST_NAME="Simple file diff" - -CREATE=`pwd`/$1 -DEPLOY=`pwd`/$2 -TEST_TOOLS=$3 - -. ./test_lib.sh - -############# Test specific code ############ - -ORG_FILE=$ORIGIN/b.txt -TGT_FILE=$TARGET/b.txt - -setup_origin () { - echo 1 >$ORIGIN/a.txt && - chgrp tty $ORIGIN/a.txt && - echo 1 > $ORG_FILE -} - -setup_target () { - echo 2 >$TARGET/a.txt && - chgrp tty $TARGET/a.txt && - echo 2 > $TGT_FILE && - chown :cdrom $TGT_FILE && - chmod 707 $TGT_FILE -} - -check_results () { - check_group $ORIGIN/a.txt tty && - check_content $ORG_FILE "2" && \ - check_perm $ORG_FILE 707 && \ - check_group $ORG_FILE cdrom && \ - check_same_mtime $ORG_FILE $TGT_FILE -} - -############################################# -main $@ diff --git a/tests/01_regular_file_add_remove.sh b/tests/01_regular_file_add_remove.sh deleted file mode 100755 index 66b5bc8..0000000 --- a/tests/01_regular_file_add_remove.sh +++ /dev/null @@ -1,32 +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 ############ - -setup_origin () { - touch $ORIGIN/remove -} - -setup_target () { - echo 1 > $TARGET/add && - chown -h :cdrom $TARGET/add -} - -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/02_fifo_diff.sh b/tests/02_fifo_diff.sh deleted file mode 100755 index f256414..0000000 --- a/tests/02_fifo_diff.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -TEST_ID="02" -TEST_NAME="Named pipe (FIFO) diff test" - -CREATE=`pwd`/$1 -DEPLOY=`pwd`/$2 -TEST_TOOLS=$3 - -. ./test_lib.sh - -############# Test specific code ############ - -setup_origin () { - mkfifo $ORIGIN/remove -} - -setup_target () { - mkfifo $TARGET/add && - chmod 707 $TARGET/add && - chown -h :cdrom $TARGET/add -} - -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_fifo_add_remove.sh b/tests/03_fifo_add_remove.sh deleted file mode 100755 index 9db6d12..0000000 --- a/tests/03_fifo_add_remove.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/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 ############ - -setup_origin () { - mkfifo $ORIGIN/remove -} - -setup_target () { - mkfifo $TARGET/add && - chmod 707 $TARGET/add && - chown -h :cdrom $TARGET/add -} - -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 deleted file mode 100755 index d975191..0000000 --- a/tests/04_symlink_diff.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -TEST_ID="04" -TEST_NAME="Symlink diff" - -CREATE=`pwd`/$1 -DEPLOY=`pwd`/$2 -TEST_TOOLS=$3 - -. ./test_lib.sh - -############# Test specific code ############ - -setup_origin () { - ( - cd $ORIGIN && - echo 1 >file && - chown :cdrom file && - mkdir -p dir && - chown :cdrom dir && - ln -s file flink && - ln -s dir dlink - ln -s /foo a - ) -} - -setup_target () { - ( - cd $TARGET && - echo 1 >file && - chown :cdrom file && - mkdir -p dir && - chown :cdrom dir && - ln -s file flink && - ln -s dir dlink - chgrp -h daemon flink dlink && - ln -s /bar a && - chown -h :cdrom a - ) -} - -check_results () { - test -f $ORIGIN/file && - check_group $ORIGIN/file cdrom && - test -d $ORIGIN/dir && - check_group $ORIGIN/dir cdrom && - check_group $ORIGIN/flink daemon && - check_group $ORIGIN/dlink daemon && - 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 deleted file mode 100755 index badf199..0000000 --- a/tests/05_symlink_add_remove.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/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 ############ - -setup_origin () { - ( - cd $ORIGIN - ln -s /foo remove && - mkdir -p data && - touch data/a data/b && - ln -s data datalink - ) -} - -setup_target () { - mkdir -p $TARGET/data && - touch $TARGET/data/a $TARGET/data/b && - ln -s /bar $TARGET/add && - chown -h :cdrom $TARGET/add -} - -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 && - test ! -L $ORIGIN/datalink && - echo datalink not link && - test -d $ORIGIN/data && - echo data is dir && - test -f $ORIGIN/data/a && - echo a is dir && - test -f $ORIGIN/data/b && - echo b is dir -} - -############################################# -main $@ diff --git a/tests/06_dir_diff.sh b/tests/06_dir_diff.sh deleted file mode 100755 index f9f56dd..0000000 --- a/tests/06_dir_diff.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -TEST_ID="06" -TEST_NAME="Dir difference" - -CREATE=`pwd`/$1 -DEPLOY=`pwd`/$2 -TEST_TOOLS=$3 - -. ./test_lib.sh - -############# Test specific code ############ - -setup_origin () { - mkdir $ORIGIN/a $ORIGIN/sticky $ORIGIN/setgid -} - -setup_target () { - mkdir $TARGET/a $TARGET/sticky $TARGET/setgid && - echo "1" > $TARGET/a/1 && - chown -h :cdrom $TARGET/a && - chmod +t $TARGET/sticky && - chmod g+s $TARGET/setgid && - chmod 707 $TARGET/a -} - -check_results () { - test -d $ORIGIN/a && - test -f $ORIGIN/a/1 && - test -k $ORIGIN/sticky && - test -g $ORIGIN/setgid && - check_same_mode $ORIGIN/a $TARGET/a && \ - check_same_uidgid $ORIGIN/a $TARGET/a && \ - check_same_mode $ORIGIN/a/1 $TARGET/a/1 && - check_same_uidgid $ORIGIN/a/1 $TARGET/a/1 && - check_content $ORIGIN/a/1 "1" -} - -############################################# -main $@ diff --git a/tests/07_dir_add_remove.sh b/tests/07_dir_add_remove.sh deleted file mode 100755 index 295b0f9..0000000 --- a/tests/07_dir_add_remove.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -TEST_ID="07" -TEST_NAME="Directory add remove" - -CREATE=`pwd`/$1 -DEPLOY=`pwd`/$2 -TEST_TOOLS=$3 - -. ./test_lib.sh - -############# Test specific code ############ - -setup_origin () { - mkdir -p $ORIGIN/remove/1/2/3/4 -} - -setup_target () { - mkdir -p $TARGET/add/4/3/2/1 && - mkdir -p $TARGET/addsticky && - mkdir -p $TARGET/addsetgid && - chown -h :cdrom $TARGET/add && - chown -h :cdrom $TARGET/add/4/3/2/1 && - chmod +t $TARGET/addsticky && - chmod g+s $TARGET/addsetgid -} - -check_results () { - test -d $ORIGIN/add/4/3/2/1 && - test ! -d $ORIGIN/remove && - test -k $ORIGIN/addsticky && - test -g $ORIGIN/addsetgid && - check_same_mtime $ORIGIN/add $TARGET/add && - check_same_mode $ORIGIN/add $TARGET/add && - check_same_uidgid $ORIGIN/add $TARGET/add && - check_same_mode $ORIGIN/add $TARGET/add && - check_same_uidgid $ORIGIN/add/4/3/2/1 $TARGET/add/4/3/2/1 -} - -############################################# -main $@ diff --git a/tests/dir_add_remove.sh.disabled b/tests/dir_add_remove.sh.disabled new file mode 100755 index 0000000..295b0f9 --- /dev/null +++ b/tests/dir_add_remove.sh.disabled @@ -0,0 +1,41 @@ +#!/bin/bash + +TEST_ID="07" +TEST_NAME="Directory add remove" + +CREATE=`pwd`/$1 +DEPLOY=`pwd`/$2 +TEST_TOOLS=$3 + +. ./test_lib.sh + +############# Test specific code ############ + +setup_origin () { + mkdir -p $ORIGIN/remove/1/2/3/4 +} + +setup_target () { + mkdir -p $TARGET/add/4/3/2/1 && + mkdir -p $TARGET/addsticky && + mkdir -p $TARGET/addsetgid && + chown -h :cdrom $TARGET/add && + chown -h :cdrom $TARGET/add/4/3/2/1 && + chmod +t $TARGET/addsticky && + chmod g+s $TARGET/addsetgid +} + +check_results () { + test -d $ORIGIN/add/4/3/2/1 && + test ! -d $ORIGIN/remove && + test -k $ORIGIN/addsticky && + test -g $ORIGIN/addsetgid && + check_same_mtime $ORIGIN/add $TARGET/add && + check_same_mode $ORIGIN/add $TARGET/add && + check_same_uidgid $ORIGIN/add $TARGET/add && + check_same_mode $ORIGIN/add $TARGET/add && + check_same_uidgid $ORIGIN/add/4/3/2/1 $TARGET/add/4/3/2/1 +} + +############################################# +main $@ diff --git a/tests/dir_diff.sh.disabled b/tests/dir_diff.sh.disabled new file mode 100755 index 0000000..f9f56dd --- /dev/null +++ b/tests/dir_diff.sh.disabled @@ -0,0 +1,40 @@ +#!/bin/bash + +TEST_ID="06" +TEST_NAME="Dir difference" + +CREATE=`pwd`/$1 +DEPLOY=`pwd`/$2 +TEST_TOOLS=$3 + +. ./test_lib.sh + +############# Test specific code ############ + +setup_origin () { + mkdir $ORIGIN/a $ORIGIN/sticky $ORIGIN/setgid +} + +setup_target () { + mkdir $TARGET/a $TARGET/sticky $TARGET/setgid && + echo "1" > $TARGET/a/1 && + chown -h :cdrom $TARGET/a && + chmod +t $TARGET/sticky && + chmod g+s $TARGET/setgid && + chmod 707 $TARGET/a +} + +check_results () { + test -d $ORIGIN/a && + test -f $ORIGIN/a/1 && + test -k $ORIGIN/sticky && + test -g $ORIGIN/setgid && + check_same_mode $ORIGIN/a $TARGET/a && \ + check_same_uidgid $ORIGIN/a $TARGET/a && \ + check_same_mode $ORIGIN/a/1 $TARGET/a/1 && + check_same_uidgid $ORIGIN/a/1 $TARGET/a/1 && + check_content $ORIGIN/a/1 "1" +} + +############################################# +main $@ diff --git a/tests/fifo_add_remove.sh.disabled b/tests/fifo_add_remove.sh.disabled new file mode 100755 index 0000000..9db6d12 --- /dev/null +++ b/tests/fifo_add_remove.sh.disabled @@ -0,0 +1,32 @@ +#!/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 ############ + +setup_origin () { + mkfifo $ORIGIN/remove +} + +setup_target () { + mkfifo $TARGET/add && + chmod 707 $TARGET/add && + chown -h :cdrom $TARGET/add +} + +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/fifo_diff.sh.disabled b/tests/fifo_diff.sh.disabled new file mode 100755 index 0000000..f256414 --- /dev/null +++ b/tests/fifo_diff.sh.disabled @@ -0,0 +1,32 @@ +#!/bin/bash + +TEST_ID="02" +TEST_NAME="Named pipe (FIFO) diff test" + +CREATE=`pwd`/$1 +DEPLOY=`pwd`/$2 +TEST_TOOLS=$3 + +. ./test_lib.sh + +############# Test specific code ############ + +setup_origin () { + mkfifo $ORIGIN/remove +} + +setup_target () { + mkfifo $TARGET/add && + chmod 707 $TARGET/add && + chown -h :cdrom $TARGET/add +} + +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/regular_file_add_remove.sh.disabled b/tests/regular_file_add_remove.sh.disabled new file mode 100755 index 0000000..66b5bc8 --- /dev/null +++ b/tests/regular_file_add_remove.sh.disabled @@ -0,0 +1,32 @@ +#!/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 ############ + +setup_origin () { + touch $ORIGIN/remove +} + +setup_target () { + echo 1 > $TARGET/add && + chown -h :cdrom $TARGET/add +} + +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/regular_file_diff.sh.disabled b/tests/regular_file_diff.sh.disabled new file mode 100755 index 0000000..0e12454 --- /dev/null +++ b/tests/regular_file_diff.sh.disabled @@ -0,0 +1,40 @@ +#!/bin/bash + +TEST_ID="00" +TEST_NAME="Simple file diff" + +CREATE=`pwd`/$1 +DEPLOY=`pwd`/$2 +TEST_TOOLS=$3 + +. ./test_lib.sh + +############# Test specific code ############ + +ORG_FILE=$ORIGIN/b.txt +TGT_FILE=$TARGET/b.txt + +setup_origin () { + echo 1 >$ORIGIN/a.txt && + chgrp tty $ORIGIN/a.txt && + echo 1 > $ORG_FILE +} + +setup_target () { + echo 2 >$TARGET/a.txt && + chgrp tty $TARGET/a.txt && + echo 2 > $TGT_FILE && + chown :cdrom $TGT_FILE && + chmod 707 $TGT_FILE +} + +check_results () { + check_group $ORIGIN/a.txt tty && + check_content $ORG_FILE "2" && \ + check_perm $ORG_FILE 707 && \ + check_group $ORG_FILE cdrom && \ + check_same_mtime $ORG_FILE $TGT_FILE +} + +############################################# +main $@ diff --git a/tests/symlink_add_remove.sh.disabled b/tests/symlink_add_remove.sh.disabled new file mode 100755 index 0000000..badf199 --- /dev/null +++ b/tests/symlink_add_remove.sh.disabled @@ -0,0 +1,48 @@ +#!/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 ############ + +setup_origin () { + ( + cd $ORIGIN + ln -s /foo remove && + mkdir -p data && + touch data/a data/b && + ln -s data datalink + ) +} + +setup_target () { + mkdir -p $TARGET/data && + touch $TARGET/data/a $TARGET/data/b && + ln -s /bar $TARGET/add && + chown -h :cdrom $TARGET/add +} + +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 && + test ! -L $ORIGIN/datalink && + echo datalink not link && + test -d $ORIGIN/data && + echo data is dir && + test -f $ORIGIN/data/a && + echo a is dir && + test -f $ORIGIN/data/b && + echo b is dir +} + +############################################# +main $@ diff --git a/tests/symlink_diff.sh.disabled b/tests/symlink_diff.sh.disabled new file mode 100755 index 0000000..d975191 --- /dev/null +++ b/tests/symlink_diff.sh.disabled @@ -0,0 +1,57 @@ +#!/bin/bash + +TEST_ID="04" +TEST_NAME="Symlink diff" + +CREATE=`pwd`/$1 +DEPLOY=`pwd`/$2 +TEST_TOOLS=$3 + +. ./test_lib.sh + +############# Test specific code ############ + +setup_origin () { + ( + cd $ORIGIN && + echo 1 >file && + chown :cdrom file && + mkdir -p dir && + chown :cdrom dir && + ln -s file flink && + ln -s dir dlink + ln -s /foo a + ) +} + +setup_target () { + ( + cd $TARGET && + echo 1 >file && + chown :cdrom file && + mkdir -p dir && + chown :cdrom dir && + ln -s file flink && + ln -s dir dlink + chgrp -h daemon flink dlink && + ln -s /bar a && + chown -h :cdrom a + ) +} + +check_results () { + test -f $ORIGIN/file && + check_group $ORIGIN/file cdrom && + test -d $ORIGIN/dir && + check_group $ORIGIN/dir cdrom && + check_group $ORIGIN/flink daemon && + check_group $ORIGIN/dlink daemon && + 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 $@ -- cgit v1.2.1