diff --git a/tests/test_mediaworker.py b/tests/test_mediaworker.py index 998805a6e5b0945a65c3e42d18708174823c9bfa..fdcb2a256e8e3cf1bee7381f73d42519b94b6200 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