From f6d920f1412ee478301a4ee4cc8b0af4d28b6069 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 30 Apr 2014 13:32:04 +0100 Subject: [PATCH] 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. (From OE-Core rev: 89868383685091b0d3723fb8f29590f3f6610078) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oeqa/controllers/masterimage.py | 6 +++++- meta/lib/oeqa/utils/__init__.py | 12 ++++++++++++ meta/lib/oeqa/utils/commands.py | 10 +++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/controllers/masterimage.py b/meta/lib/oeqa/controllers/masterimage.py index d151e24..f2585d4 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: diff --git a/meta/lib/oeqa/utils/__init__.py b/meta/lib/oeqa/utils/__init__.py index 8eda927..2260046 100644 --- a/meta/lib/oeqa/utils/__init__.py +++ b/meta/lib/oeqa/utils/__init__.py @@ -1,3 +1,15 @@ # Enable other layers to have modules in the same named directory from pkgutil import extend_path __path__ = extend_path(__path__, __name__) + + +# Borrowed from CalledProcessError + +class CommandError(Exception): + def __init__(self, retcode, cmd, output = None): + self.retcode = retcode + self.cmd = cmd + self.output = output + def __str__(self): + return "Command '%s' returned non-zero exit status %d with output: %s" % (self.cmd, self.retcode, self.output) + diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index 9b42620..7637b9d 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py @@ -1,4 +1,4 @@ -# Copyright (c) 2013 Intel Corporation +# Copyright (c) 2013-2014 Intel Corporation # # Released under the MIT license (see COPYING.MIT) @@ -14,6 +14,7 @@ import signal import subprocess import threading import logging +from oeqa.utils import CommandError class Command(object): def __init__(self, command, bg=False, timeout=None, data=None, **options): @@ -84,8 +85,8 @@ class Command(object): class Result(object): pass -def runCmd(command, ignore_status=False, timeout=None, **options): +def runCmd(command, ignore_status=False, timeout=None, assert_error=True, **options): result = Result() cmd = Command(command, timeout=timeout, **options) @@ -97,7 +98,10 @@ def runCmd(command, ignore_status=False, timeout=None, **options): result.pid = cmd.process.pid if result.status and not ignore_status: - raise AssertionError("Command '%s' returned non-zero exit status %d:\n%s" % (command, result.status, result.output)) + if assert_error: + raise AssertionError("Command '%s' returned non-zero exit status %d:\n%s" % (command, result.status, result.output)) + else: + raise CommandError(result.status, command, result.output) return result -- 2.7.4