From b29ed928da60345000a7d9c2b8d9c60c232e83fc Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Mon, 25 Feb 2019 12:21:41 +0100 Subject: [PATCH] FIX: VPP PIDs can also be separated by spaces not only by line breaks Change-Id: I6a5e8732be224927aa965cdf6b93998aa8699639 Signed-off-by: Jan Gelety --- resources/libraries/python/DUTSetup.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index a20b2d7056..631bff4e4a 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -176,19 +176,17 @@ class DUTSetup(object): 'on node: {0}\n {1}'. format(node['host'], stdout + stderr)) - if len(stdout.splitlines()) == 1: + pid_list = stdout.split() + if len(pid_list) == 1: return int(stdout) - elif not stdout.splitlines(): + elif not pid_list: logger.debug("No VPP PID found on node {0}". format(node['host'])) continue else: logger.debug("More then one VPP PID found on node {0}". format(node['host'])) - ret_list = list() - for line in stdout.splitlines(): - ret_list.append(int(line)) - return ret_list + return [int(pid) for pid in pid_list] return None -- 2.16.6