Reland "Change cleanup phase to only restart the UI instead of rebooting the machine."
This reverts commit 9479fcddc9a8578c91c844cba13243f0a4e09cbd.
Now that we've converted platform_Shutdown to a server-side test, we can safetly commit
this change.
Previously reviewed in: I07525959ea3cb76b1c0ec413b9a968660e92f832
BUG=chromium-os:34489
TEST=Ran the cleanup phase directly with autoserv with argument
server/control_segments/cleanup. I also started up a local autotest
server and ran a Job which ran through client cleanup phases.
Change-Id: I1892a2e7a9fd012461342771fe554e8f5ea59532
Reviewed-on: https://gerrit.chromium.org/gerrit/36922
Tested-by: Chris Sosa <[email protected]>
Reviewed-by: Simran Basi <[email protected]>
Commit-Ready: Chris Sosa <[email protected]>
diff --git a/server/server_job.py b/server/server_job.py
index 9cf5d84..779d3a4 100644
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -566,11 +566,11 @@
self._execute_code(CRASHINFO_CONTROL_FILE, namespace)
else:
self._execute_code(CRASHDUMPS_CONTROL_FILE, namespace)
- if self._uncollected_log_file and created_uncollected_logs:
- os.remove(self._uncollected_log_file)
self.disable_external_logging()
if cleanup and machines:
self._execute_code(CLEANUP_CONTROL_FILE, namespace)
+ if self._uncollected_log_file and created_uncollected_logs:
+ os.remove(self._uncollected_log_file)
if install_after and machines:
self._execute_code(INSTALL_CONTROL_FILE, namespace)
