SSHHost should never be using self.job without first ensuring that
it's been set. The self.job attribute is optional.
Signed-off-by: John Admanski <jadmanski@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1445 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/hosts/ssh_host.py b/server/hosts/ssh_host.py
index ee4591a..065ac64 100644
--- a/server/hosts/ssh_host.py
+++ b/server/hosts/ssh_host.py
@@ -116,7 +116,9 @@
# kill the console logger
if getattr(self, 'logger_popen', None):
self.__kill(self.logger_popen)
- self.job.warning_loggers.discard(self.warning_stream)
+ if self.job:
+ self.job.warning_loggers.discard(
+ self.warning_stream)
self.warning_stream.close()
# kill the netconsole logger
if getattr(self, 'netlogger_popen', None):
@@ -251,7 +253,8 @@
dev_null = open(os.devnull, 'w')
self.warning_stream = os.fdopen(r, 'r', 0)
- self.job.warning_loggers.add(self.warning_stream)
+ if self.job:
+ self.job.warning_loggers.add(self.warning_stream)
self.logger_popen = subprocess.Popen(cmd, stderr=dev_null)
os.close(w)