Rearranging unit tests

6 files changed, 35 insertions, 3 deletions

diff --git a/tests/03_regular_file_add_remove.sh b/tests/01_regular_file_add_remove.sh
index cdf3eab..cdf3eab 100755
--- a/tests/03_regular_file_add_remove.sh
+++ b/tests/01_regular_file_add_remove.sh
diff --git a/tests/04_fifo_add_remove.sh b/tests/02_fifo_diff.sh
index ebea443..0bf719e 100755
--- a/tests/04_fifo_add_remove.sh
+++ b/tests/02_fifo_diff.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TEST_ID="04"
+TEST_ID="02"
 TEST_NAME="Named pipe (FIFO) add remove test"
 
 CREATE=`pwd`/$1
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/01_symlink_diff.sh b/tests/04_symlink_diff.sh
index 4181a30..4b080cf 100755
--- a/tests/01_symlink_diff.sh
+++ b/tests/04_symlink_diff.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TEST_ID="01"
+TEST_ID="04"
 TEST_NAME="Symlink add/remove"
 
 CREATE=`pwd`/$1
diff --git a/tests/02_symlink_add_remove.sh b/tests/05_symlink_add_remove.sh
index 6fe54d8..147b8f0 100755
--- a/tests/02_symlink_add_remove.sh
+++ b/tests/05_symlink_add_remove.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TEST_ID="03"
+TEST_ID="05"
 TEST_NAME="Symlink add/remove"
 
 CREATE=`pwd`/$1
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