From 0c5eb8c1f751aedfa56667b5908140e6a3251cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Fri, 16 Mar 2018 16:45:12 +0100
Subject: [PATCH] Changed celerity version check (refs #23674).
---
tests/test_mediaworker.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/test_mediaworker.py b/tests/test_mediaworker.py
index 998805a6..fdcb2a25 100755
--- a/tests/test_mediaworker.py
+++ b/tests/test_mediaworker.py
@@ -97,10 +97,12 @@ def check_celerity_versions(ip):
except subprocess.CalledProcessError as e:
print('%sFailed to check celerity version in MediaWorker "%s":\n%s%s' % (RED, ip, e, DEF))
return False
- if ms_out.strip() != mw_out.strip():
- print('%sThe celerity version in MediaWorker "%s" is not the same as in MediaServer.%s\nMediaServer version: \tn%s\nMediaWorker version: \t%s' % (RED, ip, DEF, ms_out.strip(), mw_out.strip()))
+ ms_out = (ms_out[len('Version:'):] if ms_out.startswith('Version:') else ms_out).strip()
+ mw_out = (mw_out[len('Version:'):] if mw_out.startswith('Version:') else mw_out).strip()
+ if ms_out != mw_out:
+ print('%sThe celerity version in MediaWorker "%s" is not the same as in MediaServer.%s\nMediaServer version: \tn%s\nMediaWorker version: \t%s' % (RED, ip, DEF, ms_out, mw_out))
return False
- print('%sThe celerity version in MediaWorker "%s" is the same as in MediaServer.%s' % (GREEN, ip, DEF))
+ print('%sThe celerity version in MediaWorker "%s" is the same as in MediaServer.%s\nCurrent celerity version is: %s.' % (GREEN, ip, DEF, ms_out))
return True
--
GitLab