crash-reporter: Fix race between test code and rsyslogd
Change-Id: I2297d03f7da88b0fbde1303411228b4d73ec6bf1
BUG=7765
TEST=Run crashsender 1000 times
Review URL: http://codereview.chromium.org/3893005
diff --git a/crash_reporter/crash_sender b/crash_reporter/crash_sender
index 6849864..9d34e34 100644
--- a/crash_reporter/crash_sender
+++ b/crash_reporter/crash_sender
@@ -68,6 +68,12 @@
logger -t "${TAG}" "$@"
}
+# Returns true if mock is enabled.
+is_mock() {
+ [ -f "${MOCK_CRASH_SENDING}" ] && return 0
+ return 1
+}
+
cleanup() {
if [ -n "${TMP_DIR}" ]; then
rm -rf "${TMP_DIR}"
@@ -75,6 +81,11 @@
if [ ${CLEAN_UP_RUN_FILE} -eq 1 ]; then
rm -f "${RUN_FILE}"
fi
+ if is_mock; then
+ # For testing purposes, emit a message to log so that we
+ # know when the test has received all the messages from this run.
+ lecho "crash_sender done."
+ fi
}
check_not_already_running() {
@@ -165,12 +176,6 @@
grep "$2=" "$1" | cut -d = -f 2-
}
-# Returns true if mock is enabled.
-is_mock() {
- [ -f "${MOCK_CRASH_SENDING}" ] && return 0
- return 1
-}
-
# Return the board name.
get_board() {
echo $(get_key_value "/etc/lsb-release" "CHROMEOS_RELEASE_BOARD")
