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

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

Issue 3114016: Added full E2E kcrash testing (Closed) Base URL: ssh://git@chromiumos-git//autotest.git
Patch Set: fixes Created 10 years, 4 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
Index: client/site_tests/logging_UncleanShutdown/logging_UncleanShutdown.py
diff --git a/client/site_tests/logging_UncleanShutdown/logging_UncleanShutdown.py b/client/site_tests/logging_UncleanShutdown/logging_UncleanShutdown.py
index 08e18b96813f7c2315b968285bc804c17d9b64c8..93f2787ff09f5bdd52d5d6eff2a12e2f70259687 100644
--- a/client/site_tests/logging_UncleanShutdown/logging_UncleanShutdown.py
+++ b/client/site_tests/logging_UncleanShutdown/logging_UncleanShutdown.py
@@ -8,6 +8,7 @@ from autotest_lib.client.common_lib import error, utils
_CRASH_PATH = '/sbin/crash_reporter'
_PENDING_SHUTDOWN_PATH = '/var/lib/crash_reporter/pending_clean_shutdown'
+_UNCLEAN_SHUTDOWN_DETECTED_PATH = '/tmp/unclean-shutdown-detected'
_UNCLEAN_SHUTDOWN_MESSAGE = 'Last shutdown was not clean'
class logging_UncleanShutdown(site_ui_test.UITest):
@@ -25,7 +26,10 @@ class logging_UncleanShutdown(site_ui_test.UITest):
if log_reader.can_find(_UNCLEAN_SHUTDOWN_MESSAGE):
raise error.TestFail(
- 'Unexpectedly detected kernel crash during boot')
+ 'Unexpectedly detected unclean shutdown during boot')
+
+ if os.path.exists(_UNCLEAN_SHUTDOWN_DETECTED_PATH):
+ raise error.TestFail('an unclean shutdown file was detected')
# Log in and out twice to make sure that doesn't cause
# an unclean shutdown message.
@@ -40,6 +44,9 @@ class logging_UncleanShutdown(site_ui_test.UITest):
raise error.TestFail(
'Unexpectedly detected kernel crash during login/logout')
+ if os.path.exists(_UNCLEAN_SHUTDOWN_DETECTED_PATH):
+ raise error.TestFail('an unclean shutdown file was generated')
+
# Run the shutdown and verify it does not complain of unclean
# shutdown.
@@ -47,7 +54,8 @@ class logging_UncleanShutdown(site_ui_test.UITest):
utils.system('%s --clean_shutdown' % _CRASH_PATH)
utils.system('%s --init' % _CRASH_PATH)
- if log_reader.can_find(_UNCLEAN_SHUTDOWN_MESSAGE):
+ if (log_reader.can_find(_UNCLEAN_SHUTDOWN_MESSAGE) or
+ os.path.exists(_UNCLEAN_SHUTDOWN_DETECTED_PATH)):
raise error.TestFail('Incorrectly signalled unclean shutdown')
# Now simulate an unclean shutdown and test handling.
@@ -57,3 +65,8 @@ class logging_UncleanShutdown(site_ui_test.UITest):
if not log_reader.can_find(_UNCLEAN_SHUTDOWN_MESSAGE):
raise error.TestFail('Did not signal unclean shutdown when should')
+
+ if not os.path.exists(_UNCLEAN_SHUTDOWN_DETECTED_PATH):
+ raise error.TestFail('Did not touch unclean shutdown file')
+
+ os.remove(_UNCLEAN_SHUTDOWN_DETECTED_PATH)
« no previous file with comments | « client/site_tests/logging_KernelCrash/logging_KernelCrash.py ('k') | client/site_tests/logging_UserCrash/logging_UserCrash.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698