diff options
| author |   Tomi Juvonen <tomi.juvonen@nokia.com> | 2018-09-28 12:15:43 +0300 |
|---|---|---|
| committer | Tomi Juvonen <tomi.juvonen@nokia.com> | 2018-10-29 12:52:57 +0000 |
| commit | 9e012b87f560fe13f8cc63a21321a4f0c2efa1b0 (patch) | |
| tree | 5f70c3f4309d13a9fc217e404e2680ac847220cb /doctor_tests/common/utils.py | |
| parent | a7517dda9ede8bedadcbcedf7a46187268977d3a (diff) | |
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 <tomi.juvonen@nokia.com>
(cherry picked from commit a6575910a137f8932e294f66c9da3194ad937691)
Diffstat (limited to 'doctor_tests/common/utils.py')
| -rw-r--r-- | doctor_tests/common/utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
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)) |