From 0fcbbd37f9ec4f7cec17fe3a88f30052a1c255c0 Mon Sep 17 00:00:00 2001 From: Bob Clary Date: Mon, 25 May 2015 18:51:07 -0700 Subject: [PATCH] Bug 1161631 - Autophone - fix possible uninitialized PhoneTest.start_time due to device timeout in self.dm, r=gbrown. --- phonetest.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/phonetest.py b/phonetest.py index 985ed17..561c284 100644 --- a/phonetest.py +++ b/phonetest.py @@ -369,11 +369,8 @@ def handle_crashes(self): self.loggerdeco.warning('Unknown error reason: %s' % error['reason']) def setup_job(self): - self.logger_original = self.logger - self.loggerdeco_original = self.loggerdeco - self.dm_logger_original = self.dm._logger self.start_time = datetime.datetime.now() - self.stop_time = None + self.stop_time = self.start_time # Clear the Treeherder job details. self.job_details = [] # Clear the log file if we are submitting logs to Treeherder. @@ -388,6 +385,11 @@ def setup_job(self): self.build.revision_hash, tests=[self]) + self.logger_original = self.logger + self.loggerdeco_original = self.loggerdeco + # self.dm._logger can raise ADBTimeoutError due to the + # property dm therefore place it after the initialization. + self.dm_logger_original = self.dm._logger self.logger = logging.getLogger('autophone.worker.subprocess.test') self.loggerdeco = LogDecorator(self.logger, {'phoneid': self.phone.id,