From 40e03ab095aa3cdf5388255d2f04f3d182b605a9 Mon Sep 17 00:00:00 2001 From: Sawan Choudhary Date: Mon, 21 May 2018 22:54:29 -0700 Subject: [PATCH] Fix docker check failed o/p for multiple exited containers on multiple hosts Change-Id: If256fe93b608278aeb64f8846580486b8b799989 --- cloudpulse/scenario/plugins/operator_tests/operator.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cloudpulse/scenario/plugins/operator_tests/operator.py b/cloudpulse/scenario/plugins/operator_tests/operator.py index beb8e02..ea0ee30 100644 --- a/cloudpulse/scenario/plugins/operator_tests/operator.py +++ b/cloudpulse/scenario/plugins/operator_tests/operator.py @@ -244,14 +244,15 @@ class operator_scenario(base.Scenario): line[3] = line[3].replace(' ', '') line[3] = line[3].replace('(stdout)', '') if not re.match(r'^\s*$', line[3]): + line[3] = line[3].replace('\\n', ', ') if docker_failed: - docker_failed = "{}, {}: {}"\ + docker_failed = "{}; {}: {}"\ .format(docker_failed, line[0].strip(), - line[3]) + line[3].strip()) else: docker_failed = "{}: {}".format(line[0].strip(), - line[3]) + line[3].strip()) if docker_failed: return (404, docker_failed, []) else: