autotest: Fix 2 more logging_CrashSender races and re-enable in smoke

client/bin/site_crash_test.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging, os, re
 from autotest_lib.client.bin import site_log_reader, site_utils, test
 from autotest_lib.client.common_lib import error, utils
 
 
 class CrashTest(test.test):
@@ skipping 168 matching lines @@
         return {'exec_name': exec_name,
                 'report_kind': report_kind,
                 'meta_path': meta_path,
                 'report_payload': report_payload,
                 'send_attempt': send_attempt,
                 'send_success': send_success,
                 'sleep_time': sleep_time,
                 'output': output}
 
 
+    def wait_for_sender_completion(self):
+        """Wait for crash_sender to complete.
+
+        Wait for no crash_sender's last message to be placed in the
+        system log before continuing and for the process to finish.
+        Otherwise we might get only part of the output."""
+        site_utils.poll_for_condition(
+            lambda: self._log_reader.can_find('crash_sender done.'),
+            timeout=60,
+            exception=error.TestError(
+              'Timeout waiting for crash_sender to emit done: ' +
+              self._log_reader.get_logs()))
+        site_utils.poll_for_condition(
+            lambda: utils.system('pgrep crash_sender',
+                                 ignore_status=True) != 0,
+            timeout=60,
+            exception=error.TestError(
+                'Timeout waiting for crash_sender to finish: ' +
+                self._log_reader.get_logs()))
+
+
     def _call_sender_one_crash(self,
                                send_success=True,
                                reports_enabled=True,
                                username='root',
                                report=None):
         """Call the crash sender script to mock upload one crash.
 
         Args:
           send_success: Mock a successful send if true
           reports_enabled: Has the user consented to sending crash reports.
           username: user to emulate a crash from
           report: report to use for crash, if None we create one.
 
         Returns:
           Returns a dictionary describing the result with the keys
           from _parse_sender_output, as well as:
             report_exists: does the minidump still exist after calling
               send script
             rate_count: how many crashes have been uploaded in the past
               24 hours.
         """
         report = self._prepare_sender_one_crash(send_success,
                                                 reports_enabled,
                                                 username,
                                                 report)
         self._log_reader.set_start_by_current()
         script_output = utils.system_output(
             '/bin/sh -c "%s" 2>&1' % self._CRASH_SENDER_PATH,
             ignore_status=True)
-        # Wait for up to 2s for no crash_sender to be running,
-        # otherwise me might get only part of the output.
-        site_utils.poll_for_condition(
-            lambda: utils.system('pgrep crash_sender',
-                                 ignore_status=True) != 0,
-            timeout=2,
-            exception=error.TestError(
-              'Timeout waiting for crash_sender to finish: ' +
-              self._log_reader.get_logs()))
-
+        self.wait_for_sender_completion()
         output = self._log_reader.get_logs()
         logging.debug('Crash sender message output:\n' + output)
         if script_output != '':
             raise error.TestFail(
                 'Unexpected crash_sender stdout/stderr: ' + script_output)
 
         if os.path.exists(report):
             report_exists = True
             os.remove(report)
         else:
@@ skipping 63 matching lines @@
                 self._initialize_crash_reporter()
             # Disable crash_sender from running, kill off any running ones, but
             # set environment so crash_sender may run as a child process.
             self._set_system_sending(False)
             self._set_child_sending(True)
             self._kill_running_sender()
             self._reset_rate_limiting()
             if clear_spool_first:
                 self._clear_spooled_crashes()
             getattr(self, '_test_' + test_name)()