From f5723961ef7fc9c71222e8b45e0de39e7f15e90e Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Wed, 19 Feb 2014 14:34:18 +0000
Subject: Update 'baserock-system-config-sync' tests to check permissions

---
 tests/run_tests.sh | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index ea92924..36dff01 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -12,6 +12,34 @@ then
 	exit 1
 fi
 
+compare_dirs() {
+
+    # Temporary files used to compare the file permissions
+    file1=$(mktemp)
+    file2=$(mktemp)
+
+    set +e
+    (
+        set -e
+        # Getting the file permissions
+        (cd "$1" && busybox find * -exec busybox stat -c '%n %a' {} + | sort) > "$file1"
+        (cd "$2" && busybox find * -exec busybox stat -c '%n %a' {} + | sort) > "$file2"
+
+        # Compare file contents
+        diff -r "$1" "$2"
+
+        # Compare permissions
+        diff "$file1" "$file2"
+    )
+    local ret="$?"
+
+    # Clean temporary files
+    rm "$file1"
+    rm "$file2"
+
+    return $ret
+}
+
 echo "Starting baserock-system-config-sync tests"
 merge_pass_folder="bscs-merge.pass"
 merge_fail_folder="bscs-merge.fail"
@@ -33,7 +61,7 @@ for folder in "$merge_pass_folder/"*.in; do
     if [ "$exit_code" -ne 0 ]; then
         echo ": FAILED (exit code "$exit_code")" 1>&2
         exit 1
-    elif ! diff -r "$TMPDIR/"*/ "$out_folder/" &>> "$bscs_log"; then
+    elif ! compare_dirs "$TMPDIR/"*/ "$out_folder/" &>> "$bscs_log"; then
         echo ": FAILED (different diff)" 1>&2
         exit 1
     else
@@ -73,7 +101,7 @@ exit_code="$?"
 if [ "$exit_code" -ne 0 ]; then
     echo ": FAILED (exit code "$exit_code")" 1>&2
     exit 1
-elif ! diff -r "$TMPDIR/"*/ "$out_folder/" &>> "$bscs_log"; then
+elif ! compare_dirs "$TMPDIR/"*/ "$out_folder/" &>> "$bscs_log"; then
     echo ": FAILED (different diff)" 1>&2a
     exit 1
 else
-- 
cgit v1.2.1