summaryrefslogtreecommitdiff
path: root/meta/lib/oeqa/controllers
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-04-30 13:32:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-30 21:52:12 +0100
commit89868383685091b0d3723fb8f29590f3f6610078 (patch)
treef14f7fa22a11b263769173cead5a9528584c2a22 /meta/lib/oeqa/controllers
parentf71e9fe7c31fa44f5185d9ab64813ba2af57ca2a (diff)
downloadopenembedded-core-89868383685091b0d3723fb8f29590f3f6610078.tar.gz
openembedded-core-89868383685091b0d3723fb8f29590f3f6610078.tar.bz2
openembedded-core-89868383685091b0d3723fb8f29590f3f6610078.zip
oeqa: add proper handling for command errors where needed
For use outside of tests themselves, we want a better error than AssertionError, so create one and allow us to request it when calling runCmd(). This enables us to avoid tracebacks during master image operations if the power control command fails. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/controllers')
-rw-r--r--meta/lib/oeqa/controllers/masterimage.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/lib/oeqa/controllers/masterimage.py b/meta/lib/oeqa/controllers/masterimage.py
index d151e24bd7..f2585d4860 100644
--- a/meta/lib/oeqa/controllers/masterimage.py
+++ b/meta/lib/oeqa/controllers/masterimage.py
@@ -20,6 +20,7 @@ import subprocess
import oeqa.targetcontrol
import oeqa.utils.sshcontrol as sshcontrol
import oeqa.utils.commands as commands
+from oeqa.utils import CommandError
from abc import ABCMeta, abstractmethod
@@ -94,7 +95,10 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget):
def power_ctl(self, msg):
if self.powercontrol_cmd:
cmd = "%s %s" % (self.powercontrol_cmd, msg)
- commands.runCmd(cmd, preexec_fn=os.setsid, env=self.origenv)
+ try:
+ commands.runCmd(cmd, assert_error=False, preexec_fn=os.setsid, env=self.origenv)
+ except CommandError as e:
+ bb.fatal(str(e))
def power_cycle(self, conn):
if self.powercontrol_cmd: