autotest: Test that logs can be sent when processes crash

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 14 matching lines @@
             raise error.TestFail('Missing board name %s in output' %
                                  board_match.group(1))
         # Get hwid
         hwclass = 'undefined'
         if os.path.exists(_HWCLASS_PATH):
             hwclass = utils.read_file(_HWCLASS_PATH)
         if not ('HWClass: %s' % hwclass) in result['output']:
             raise error.TestFail('Expected hwclass %s in output' % hwclass)
 
 
-    def _check_simple_minidump_send(self, report):
+    def _check_simple_minidump_send(self, report, log_path=None):
         result = self._call_sender_one_crash(report=report)
         if (result['report_exists'] or
             result['rate_count'] != 1 or
             not result['send_attempt'] or
             not result['send_success'] or
             result['sleep_time'] < 0 or
             result['sleep_time'] >= _SECONDS_SEND_SPREAD or
             result['report_kind'] != 'minidump' or
             result['report_payload'] != '/var/spool/crash/fake.dmp' or
             result['exec_name'] != 'fake' or
             not 'Version: my_ver' in result['output']):
             raise error.TestFail('Simple minidump send failed')
+        if log_path and not ('log: @%s' % log_path) in result['output']:
+            raise error.TestFail('Minidump send missing log')
         self._check_hardware_info(result)
 
 
     def _test_sender_simple_minidump(self):
         """Test sending a single minidump crash report."""
         self._check_simple_minidump_send(None)
 
 
+    def _test_sender_simple_minidump_with_log(self):
+        """Test that a minidump report with an auxiliary log is sent."""
+        dmp_path = self.write_crash_dir_entry('fake.dmp', '')
+        log_path = self.write_crash_dir_entry('fake.log', '')
+        meta_path = self.write_fake_meta('fake.meta', 'fake', dmp_path,
+                                         log=log_path)
+        self._check_simple_minidump_send(meta_path, log_path)
+
+
     def _shift_file_mtime(self, path, delta):
         statinfo = os.stat(path)
         os.utime(path, (statinfo.st_atime,
                         statinfo.st_mtime + delta))
 
 
     def _test_sender_simple_old_minidump(self):
         """Test that old minidumps and metadata are sent."""
         dmp_path = self.write_crash_dir_entry('fake.dmp', '')
         meta_path = self.write_fake_meta('fake.meta', 'fake', dmp_path)
@@ skipping 189 matching lines @@
         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_minidump_with_log',
             'sender_simple_kernel_crash',
             'sender_pausing',
             'sender_reports_disabled',
             'sender_rate_limiting',
             'sender_single_instance',
             'sender_send_fails',
             'sender_orphaned_files',
             'sender_incomplete_metadata',
             'sender_missing_payload',
             'cron_runs'])