From 75fa2f0ae0b9dda3037a107292b34b2eef876693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Wed, 15 Mar 2017 11:12:55 +0100
Subject: [PATCH] Changed SSL test.
---
tests/test_ssl.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
index ea1fddf6..f912a0bd 100755
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -29,15 +29,18 @@ conf = es_utils.load_conf()
all_ok = True
conf_servers = (
- 'MS_SERVER_NAME',
- 'MONITOR_SERVER_NAME',
- 'CM_SERVER_NAME',
+ ('MS_SERVER_NAME', 'mediaserver'),
+ ('MONITOR_SERVER_NAME', 'monitor'),
+ ('CM_SERVER_NAME', 'campusmanager'),
)
-for s in conf_servers:
+for s, d in conf_servers:
v = conf.get(s)
+ if v == d:
+ # vhost is using default value (the service is surely not installed)
+ continue
try:
- url = "https://%s" % v
+ url = 'https://%s' % v
print('Checking SSL certificate of %s' % url)
requests.get(url)
except requests.exceptions.SSLError:
--
GitLab