Fix warning_monitor
From: jadmanski@google.com
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1258 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/hosts/ssh_host.py b/server/hosts/ssh_host.py
index 9253871..977674c 100644
--- a/server/hosts/ssh_host.py
+++ b/server/hosts/ssh_host.py
@@ -114,6 +114,7 @@
# kill the console logger
if getattr(self, 'logger_popen', None):
self.__kill(self.logger_popen)
+ self.job.warning_loggers.remove(self.warning_stream)
self.warning_stream.close()
# kill the netconsole logger
if getattr(self, 'netlogger_popen', None):
@@ -242,7 +243,7 @@
cmd = [self.conmux_attach, self.__conmux_hostname(),
'%s %s %s %d' % (sys.executable, script_path,
logfilename, w)]
- dev_null = open('/dev/null', 'w')
+ dev_null = open(os.devnull, 'w')
self.warning_stream = os.fdopen(r, 'r', 0)
self.job.warning_loggers.add(self.warning_stream)