From a6575910a137f8932e294f66c9da3194ad937691 Mon Sep 17 00:00:00 2001 From: Tomi Juvonen Date: Fri, 28 Sep 2018 12:15:43 +0300 Subject: Support Apex with services in containers Upstream apex now works in containers, so if used, it needs to be supported JIRA: DOCTOR-130 Change-Id: I3d73a1699e4fee53b001f043f55d0eeefa7bfb7b Signed-off-by: Tomi Juvonen --- doctor_tests/common/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doctor_tests/common') diff --git a/doctor_tests/common/utils.py b/doctor_tests/common/utils.py index 1a84c824..1a8840dd 100644 --- a/doctor_tests/common/utils.py +++ b/doctor_tests/common/utils.py @@ -67,7 +67,7 @@ class SSHClient(object): def __del__(self): self.client.close() - def ssh(self, command): + def ssh(self, command, raise_enabled=True): if self.log: self.log.info("Executing: %s" % command) stdin, stdout, stderr = self.client.exec_command(command) @@ -75,7 +75,7 @@ class SSHClient(object): output = list() for line in stdout.read().splitlines(): output.append(line.decode('utf-8')) - if ret: + if ret and raise_enabled: if self.log: self.log.info("*** FAILED to run command %s (%s)" % (command, ret)) -- cgit 1.2.3-korg