Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Unified Diff: client/site_tests/logging_CrashSender/logging_CrashSender.py

Issue 3917003: autotest: Fix 2 more logging_CrashSender races and re-enable in smoke (Closed) Base URL: http://git.chromium.org/git/autotest.git
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « client/bin/site_crash_test.py ('k') | client/site_tests/suite_Smoke/control » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/site_tests/logging_CrashSender/logging_CrashSender.py
diff --git a/client/site_tests/logging_CrashSender/logging_CrashSender.py b/client/site_tests/logging_CrashSender/logging_CrashSender.py
index 2a2ef6be8c3687a834d6f39950d82c52aa52e820..47e5f93c57b359634379186da99cb7608aa559f1 100644
--- a/client/site_tests/logging_CrashSender/logging_CrashSender.py
+++ b/client/site_tests/logging_CrashSender/logging_CrashSender.py
@@ -227,14 +227,15 @@ class logging_CrashSender(site_crash_test.CrashTest):
report=None)
if not os.path.exists(minidump):
raise error.TestError('minidump not created')
- 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')
+ utils.system(_CRASH_SENDER_CRON_PATH)
+ 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')
« no previous file with comments | « client/bin/site_crash_test.py ('k') | client/site_tests/suite_Smoke/control » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698