From 55b966b43b3f19dc2cd15615dee196f56e89661c Mon Sep 17 00:00:00 2001
From: Axel Kittenberger <axkibe@gmail.com>
Date: Tue, 3 Aug 2010 14:24:46 +0000
Subject: [PATCH] beautified script output

---
 tests/directorycpr.sh | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/tests/directorycpr.sh b/tests/directorycpr.sh
index 0ee2b9e..8244a46 100755
--- a/tests/directorycpr.sh
+++ b/tests/directorycpr.sh
@@ -2,41 +2,46 @@
 # test the case of directory being cp -r'ed and touched. lsyncd 1.0 doesn't handle this case well.
 
 set -e
+CON="\E[47;34m"
+COFF="\033[0m"
 
 WORKSOURCE=$(mktemp -d)
 WORKTARGET=$(mktemp -d)
 PIDFILE=$(mktemp)
 LOGFILE=$(mktemp)
 
-# populate the filesystem.
+
+
+echo -e "$CON* populating the filesystem$COFF"
 mkdir -p "${WORKSOURCE}"/a/a
 echo 'test' > "${WORKSOURCE}"/a/a/file
 
-./lsyncd --logfile "${LOGFILE}" --pidfile "${PIDFILE}" "${WORKSOURCE}" "${WORKTARGET}"
+echo -e "$CON* starting lsyncd$COFF"
+./lsyncd --logfile "${LOGFILE}" --pidfile "${PIDFILE}" --no-daemon "${WORKSOURCE}" "${WORKTARGET}"&
 
-# try to wait until lsyncd starts and rsyncs initial file, hope 4s is enough.
+echo -e "$CON* waiting for lsyncd to start$COFF"
 sleep 4s
 
-# cp -r the directory, this sometimes succeeds, sometimes fails.
+# cp -r the directory
+echo -e "$CON* make a lot of copies$OFF"
 for A in 1 2 3 4 5 6 7 8 9 10; do
     cp -r "${WORKSOURCE}"/a "${WORKSOURCE}"/b${A}
     echo 'test2' > "${WORKSOURCE}"/b${A}/a/another
 done
 
-# mkdir path while lsyncd is running
+echo -e "$CON* mkdir double path$OFF"
 mkdir -p "${WORKSOURCE}"/c/a
 echo 'test3' > "${WORKSOURCE}"/c/a/file
-
-# cp the dir while lsyncd is running.
-# it's a race condition, do it 10 times.
+echo -e "$CON* copy the other dir a few times$COFF"
 for A in 1 2 3 4 5 6 7 8 9 10; do
     cp -r "${WORKSOURCE}"/c "${WORKSOURCE}"/d${A}
     echo 'test2' > "${WORKSOURCE}"/d${A}/a/another
 done
 
-# try to wait until lsyncd does the job.
-sleep 10s
+echo -e "$CON*waiting until lsyncd does the job.$COFF"
+sleep 15s
 
+echo -e "$CON*killing lsyncd"
 LSYNCPID=$(cat "${PIDFILE}")
 if ! kill "${LSYNCPID}"; then
     cat "${LOGFILE}"
@@ -46,14 +51,14 @@ if ! kill "${LSYNCPID}"; then
 fi
 sleep 1s
 
+#echo "log file contents"
+#cat "${LOGFILE}"
+##this should be grep.
 
-echo "log file contents"
-cat "${LOGFILE}"
-#this should be grep.
-
+echo -e "$CON*differences$COFF"
 diff -urN "${WORKSOURCE}" "${WORKTARGET}"
 
-rm "${PIDFILE}"
-rm "${LOGFILE}"
-rm -rf "${WORKTARGET}"
-rm -rf "${WORKSOURCE}"
+#rm "${PIDFILE}"
+#rm "${LOGFILE}"
+#rm -rf "${WORKTARGET}"
+#rm -rf "${WORKSOURCE}"