summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/targetcontrol.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-31 15:59:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-06 11:24:26 +0100
commit546c32753b2f0c2174c360ba83a7d2f7ffbb33f7 (patch)
tree85adaffbf373b0c2d4c94e9b8fba7ef9835ccd3b /meta/lib/oeqa/targetcontrol.py
parentd9cb21854b139e9f8620ee256a3957db542494da (diff)
downloadpoky-546c32753b2f0c2174c360ba83a7d2f7ffbb33f7.tar.gz
classes/lib: Remove bb.build.FuncFailed
Whilst seemingly a good idea, this exception doesn't really serve any purpose that bb.fatal() doesn't cover. Wrapping exceptions within exceptions isn't pythonic. Its not used in many places, lets clean up those and remove usage of it entirely. It may ultimately be dropped form bitbake entirely. (From OE-Core rev: efe87ce4b2154c6f1c591ed9d8f770c229b044ad) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/targetcontrol.py')
-rw-r--r--meta/lib/oeqa/targetcontrol.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 15e617c95a..1445e3ecfb 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -175,7 +175,7 @@ class QemuTarget(BaseTarget):
175 if os.path.exists(self.qemulog): 175 if os.path.exists(self.qemulog):
176 with open(self.qemulog, 'r') as f: 176 with open(self.qemulog, 'r') as f:
177 bb.error("Qemu log output from %s:\n%s" % (self.qemulog, f.read())) 177 bb.error("Qemu log output from %s:\n%s" % (self.qemulog, f.read()))
178 raise bb.build.FuncFailed("%s - FAILED to start qemu - check the task log and the boot log" % self.pn) 178 raise RuntimeError("%s - FAILED to start qemu - check the task log and the boot log" % self.pn)
179 179
180 def check(self): 180 def check(self):
181 return self.runner.is_alive() 181 return self.runner.is_alive()
@@ -192,7 +192,7 @@ class QemuTarget(BaseTarget):
192 self.server_ip = self.runner.server_ip 192 self.server_ip = self.runner.server_ip
193 self.connection = SSHControl(ip=self.ip, logfile=self.sshlog) 193 self.connection = SSHControl(ip=self.ip, logfile=self.sshlog)
194 else: 194 else:
195 raise bb.build.FuncFailed("%s - FAILED to re-start qemu - check the task log and the boot log" % self.pn) 195 raise RuntimError("%s - FAILED to re-start qemu - check the task log and the boot log" % self.pn)
196 196
197 def run_serial(self, command, timeout=60): 197 def run_serial(self, command, timeout=60):
198 return self.runner.run_serial(command, timeout=timeout) 198 return self.runner.run_serial(command, timeout=timeout)