Commit ce29b782 authored by Anders Blomdell's avatar Anders Blomdell
Browse files

A little bit more quiet

parent 23c3b2fe
......@@ -147,7 +147,6 @@ class Server:
writer.close()
self.failed = False
finally:
self.log.MESSAGE('shutting down tar_socket')
tar_socket.shutdown(socket.SHUT_RDWR)
pass
......
......@@ -37,6 +37,13 @@ secondary {
EOF
}
run() {
if [ -z "${VERBOSE}" ] ; then
$@ 2> /dev/null
else
$@
fi
}
mkdir -p "${TESTDIR}/1/test"
mkdir -p "${TESTDIR}/1/TRASH"
mkdir -p "${TESTDIR}/2/.git/refs"
......@@ -48,7 +55,7 @@ config > "${TESTDIR}/2/TOTALBACKUP.config"
#../config.py <(config)
cp ../sha512backup "${TESTDIR}/"
${TESTDIR}/sha512backup --xattr --primary <(config) 2> /dev/null
run ${TESTDIR}/sha512backup --xattr --primary <(config)
# Check that source and dest are equal
diff -u \
<(cd ../test ; find | sort) \
......@@ -61,10 +68,10 @@ diff -u \
rm ${TESTFILE}
# Make sure source and dest differs
! \
diff -u \
<(cd ../test ; find | sort) \
<(cd ${TESTDIR}/1/test ; find | sort)
[ $(diff -u \
<(cd ../test ; find | sort) \
<(cd ${TESTDIR}/1/test ; find | sort) \
| egrep '^[+-][^+-]') == "+${TESTFILE}" ]
diff -u \
<(cd ../test ; find | sort) \
<(cd ${TESTDIR}/1/test ; find | grep -v "${TESTFILE}" | sort)
......@@ -73,7 +80,7 @@ diff -u \
<(cd ${TESTDIR}/2/.git/refs ; find | sort)
# Bring dest to sync
${TESTDIR}/sha512backup --xattr --primary <(config) 2> /dev/null
run ${TESTDIR}/sha512backup --xattr --primary <(config)
# Check that source and dest are equal
diff -u \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment