From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 27 Jul 2015 21:15:57 +0000 (+0100)
Subject: oeqa/qemurunner: Fix AttributeError: QemuRunner instance has no attribute 'server_socket'
X-Git-Tag: 2015-10~1074
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=26fb69ec663afd05134822dc5e48fc8928ea5bf1;p=openembedded-core.git

oeqa/qemurunner: Fix AttributeError: QemuRunner instance has no attribute 'server_socket'

If start() returns False due to create_socker() failing, stop() may still get
called and currently this gives a track back since server_socket doesn't exist.

Avoid this.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 7f8331ad27..1cf8f7668c 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -190,7 +190,7 @@ class QemuRunner:
                 logger.info("Sending SIGKILL to runqemu")
                 os.killpg(self.runqemu.pid, signal.SIGKILL)
             self.runqemu = None
-        if self.server_socket:
+        if hasattr(self, 'server_socket') and self.server_socket:
             self.server_socket.close()
             self.server_socket = None
         self.qemupid = None