diff --git a/tests/test_mediaworker.py b/tests/test_mediaworker.py index f30210afa239414ec77c94184e233e9825443599..998805a6e5b0945a65c3e42d18708174823c9bfa 100755 --- a/tests/test_mediaworker.py +++ b/tests/test_mediaworker.py @@ -92,13 +92,13 @@ def check_celerity_connectivity(ip): def check_celerity_versions(ip): print('Checking tha celerity server and worker uses the same version.') try: - ms_out = subprocess.check_output('dpkg -s celerity-utils', shell=True, timeout=10, universal_newlines=True) - mw_out = subprocess.check_output('ssh -t root@%s dpkg -s celerity-utils' % ip, shell=True, timeout=10, universal_newlines=True) + ms_out = subprocess.check_output('dpkg -s celerity-utils | grep "^Version:"', shell=True, timeout=10, universal_newlines=True) + mw_out = subprocess.check_output('ssh -t root@%s dpkg -s celerity-utils | grep "^Version:"' % ip, shell=True, timeout=10, universal_newlines=True) 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:\n%s\nMediaWorker version:\n%s' % (RED, ip, DEF, 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())) return False print('%sThe celerity version in MediaWorker "%s" is the same as in MediaServer.%s' % (GREEN, ip, DEF)) return True