From 02203eb936986e6b6b0b366120c6b3407f37d91c Mon Sep 17 00:00:00 2001
From: Alberto <alberto.ruiz@codethink.co.uk>
Date: Mon, 3 Oct 2011 13:25:53 +0100
Subject: Added symlink add/remove test

---
 tests/00_regular_file_diff.sh  |  4 ----
 tests/01_symlink.sh            | 32 --------------------------------
 tests/01_symlink_diff.sh       | 29 +++++++++++++++++++++++++++++
 tests/02_symlink_add_remove.sh | 32 ++++++++++++++++++++++++++++++++
 tests/test_lib.sh              |  5 +++++
 5 files changed, 66 insertions(+), 36 deletions(-)
 delete mode 100755 tests/01_symlink.sh
 create mode 100755 tests/01_symlink_diff.sh
 create mode 100755 tests/02_symlink_add_remove.sh

(limited to 'tests')

diff --git a/tests/00_regular_file_diff.sh b/tests/00_regular_file_diff.sh
index a382a72..4eb6672 100755
--- a/tests/00_regular_file_diff.sh
+++ b/tests/00_regular_file_diff.sh
@@ -11,8 +11,6 @@ TEST_TOOLS=$3
 
 ############# Test specific code ############
 
-# This test checks that normal files content and metadata are 
-
 ORG_FILE=$ORIGIN/b.txt
 TGT_FILE=$TARGET/b.txt
 
@@ -23,8 +21,6 @@ function setup {
 	chmod 707 $TGT_FILE
 }
 
-# check_same_mtime FILE_A FILE_B
-
 function check_results {
 	check_content    $ORG_FILE "2" && \
 	check_perm       $ORG_FILE 707 && \
diff --git a/tests/01_symlink.sh b/tests/01_symlink.sh
deleted file mode 100755
index b3280c2..0000000
--- a/tests/01_symlink.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-TEST_ID="01"
-TEST_NAME="Simple symlink diff"
-
-CREATE=`pwd`/$1
-DEPLOY=`pwd`/$2
-TEST_TOOLS=$3
-
-. ./test_lib.sh
-
-############# Test specific code ############
-
-# This test checks that normal files content and metadata are 
-
-function setup {
-	ln -s /foo $ORIGIN/a && \
-	ln -s /bar $TARGET/a && \
-	chown -h :cdrom $TARGET/a
-}
-
-# check_same_mtime FILE_A FILE_B
-
-function check_results {
-	test -L $ORIGIN/a           && \
-	check_symlink    $ORIGIN/a "/bar"        && \
-	check_group      $ORIGIN/a cdrom         && \
-	check_same_mtime $ORIGIN/a $ORIGIN/a
-}
-
-#############################################
-main $@
diff --git a/tests/01_symlink_diff.sh b/tests/01_symlink_diff.sh
new file mode 100755
index 0000000..4246865
--- /dev/null
+++ b/tests/01_symlink_diff.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+TEST_ID="02"
+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_symlink_add_remove.sh b/tests/02_symlink_add_remove.sh
new file mode 100755
index 0000000..b3280c2
--- /dev/null
+++ b/tests/02_symlink_add_remove.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+TEST_ID="01"
+TEST_NAME="Simple symlink diff"
+
+CREATE=`pwd`/$1
+DEPLOY=`pwd`/$2
+TEST_TOOLS=$3
+
+. ./test_lib.sh
+
+############# Test specific code ############
+
+# This test checks that normal files content and metadata are 
+
+function setup {
+	ln -s /foo $ORIGIN/a && \
+	ln -s /bar $TARGET/a && \
+	chown -h :cdrom $TARGET/a
+}
+
+# check_same_mtime FILE_A FILE_B
+
+function check_results {
+	test -L $ORIGIN/a           && \
+	check_symlink    $ORIGIN/a "/bar"        && \
+	check_group      $ORIGIN/a cdrom         && \
+	check_same_mtime $ORIGIN/a $ORIGIN/a
+}
+
+#############################################
+main $@
diff --git a/tests/test_lib.sh b/tests/test_lib.sh
index 2c182a7..6d431d0 100644
--- a/tests/test_lib.sh
+++ b/tests/test_lib.sh
@@ -11,6 +11,11 @@ function check_same_mtime {
 	test $(stat -c %Y $1) = $(stat -c %Y $2)
 }
 
+# check_same_uidgid FILE_A FILE_B
+function check_same_uidgid {
+	test $(stat -c "%u.%g" $1) = $(stat -c "%u.%g" $2)
+}
+
 # check_content FILE EXPECTED_OCTAL_PERMISSIONS
 function check_perm {
 	test $(stat -c %a $1) = $2
-- 
cgit v1.2.1