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

client/site_tests/logging_CrashSender/logging_CrashSender.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_crash_test, site_utils, test
 from autotest_lib.client.common_lib import error, utils
 
 _25_HOURS_AGO = -25 * 60 * 60
 _CRASH_SENDER_CRON_PATH = '/etc/cron.hourly/crash_sender.hourly'
@@ skipping 209 matching lines @@
         Assuming we've run test_sender_simple which shows that a minidump
         gets removed as part of sending, we run the cron job (which is
         asynchronous) and wait for that file to be removed to just verify
         the job eventually runs the sender."""
         minidump = self._prepare_sender_one_crash(send_success=True,
                                                   reports_enabled=True,
                                                   username='root',
                                                   report=None)
         if not os.path.exists(minidump):
             raise error.TestError('minidump not created')
+        self._log_reader.set_start_by_current()
         utils.system(_CRASH_SENDER_CRON_PATH)
-        self._log_reader.set_start_by_current()
-        site_utils.poll_for_condition(
-            lambda: not os.path.exists(minidump),
-            desc='minidump to be removed')
+        self.wait_for_sender_completion()
+        if os.path.exists(minidump):
+            raise error.TestFail('minidump was not removed')
         crash_sender_log = self._log_reader.get_logs()
         logging.debug('Contents of crash sender log: ' + crash_sender_log)
         result = self._parse_sender_output(crash_sender_log)
+        logging.debug('Result of crash send: %s' % result)
         if not result['send_attempt'] or not result['send_success']:
             raise error.TestFail('Cron simple run test failed')
 
 
     def run_once(self):
         self.run_crash_tests([
             'sender_simple_minidump',
             'sender_simple_old_minidump',
             'sender_simple_kernel_crash',
             'sender_pausing',
             'sender_reports_disabled',
             'sender_rate_limiting',
             'sender_single_instance',
             'sender_send_fails',
             'sender_orphaned_files',
             'sender_incomplete_metadata',
             'cron_runs'])