add tests for tls and https handlers

keeprocking · Aug 23, 2020 · 0d93acc · 0d93acc
1 parent a2c6df1
commit 0d93acc
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/tests/test_common_fields.py b/tests/test_common_fields.py
@@ -17,7 +17,8 @@
     GelfHttpHandler(host='127.0.0.1', port=12203, compress=False),
     GelfTlsHandler(host='127.0.0.1', port=12204),
     GelfHttpsHandler(host='127.0.0.1', port=12205, validate=False),
-    # GelfTlsHandler(host='127.0.0.1', port=12204, validate=True, ca_certs='tests/config/cert.pem'),
+    GelfHttpsHandler(host='localhost', port=12205, validate=True, ca_certs='tests/config/cert.pem'),
+    GelfTlsHandler(host='127.0.0.1', port=12204, validate=True, ca_certs='tests/config/cert.pem'),
 ])
 def handler(request):
     return request.param

diff --git a/tests/test_debug_mode.py b/tests/test_debug_mode.py
@@ -1,5 +1,5 @@
 import pytest
-from pygelf import GelfTcpHandler, GelfUdpHandler, GelfHttpHandler, GelfTlsHandler
+from pygelf import GelfTcpHandler, GelfUdpHandler, GelfHttpHandler, GelfTlsHandler, GelfHttpsHandler
 from tests.helper import logger, get_unique_message, log_warning
 
 
@@ -10,7 +10,9 @@
     GelfHttpHandler(host='127.0.0.1', port=12203, debug=True),
     GelfHttpHandler(host='127.0.0.1', port=12203, compress=False, debug=True),
     GelfTlsHandler(host='127.0.0.1', port=12204, debug=True),
-    # GelfTlsHandler(host='127.0.0.1', port=12204, debug=True, validate=True, ca_certs='tests/config/cert.pem'),
+    GelfTlsHandler(host='127.0.0.1', port=12204, debug=True, validate=True, ca_certs='tests/config/cert.pem'),
+    GelfHttpsHandler(host='localhost', port=12205, debug=True, validate=True, ca_certs='tests/config/cert.pem')
+
 ])
 def handler(request):
     return request.param

diff --git a/tests/test_dynamic_fields.py b/tests/test_dynamic_fields.py
@@ -20,7 +20,7 @@ def filter(self, record):
     GelfHttpHandler(host='127.0.0.1', port=12203, compress=False, include_extra_fields=True),
     GelfTlsHandler(host='127.0.0.1', port=12204, include_extra_fields=True),
     GelfHttpsHandler(host='127.0.0.1', port=12205, validate=False, include_extra_fields=True),
-    # GelfTlsHandler(host='127.0.0.1', port=12204, validate=True, ca_certs='tests/config/cert.pem', include_extra_fields=True),
+    GelfTlsHandler(host='127.0.0.1', port=12204, validate=True, ca_certs='tests/config/cert.pem', include_extra_fields=True),
 ])
 def handler(request):
     return request.param

diff --git a/tests/test_queuehandler_support.py b/tests/test_queuehandler_support.py
@@ -13,8 +13,8 @@
     GelfHttpHandler(host='127.0.0.1', port=12203, compress=False),
     GelfTlsHandler(host='127.0.0.1', port=12204),
     GelfHttpsHandler(host='127.0.0.1', port=12205, validate=False),
-    # GelfTlsHandler(host='127.0.0.1', port=12204, validate=True, ca_certs='tests/config/cert.pem'),
-    # GelfHttpsHandler(host='127.0.0.1', port=12205, validate=True, ca_certs='tests/config/cert.pem')
+    GelfTlsHandler(host='127.0.0.1', port=12204, validate=True, ca_certs='tests/config/cert.pem'),
+    GelfHttpsHandler(host='localhost', port=12205, validate=True, ca_certs='tests/config/cert.pem'),
 ])
 def handler(request):
     return request.param

diff --git a/tests/test_static_fields.py b/tests/test_static_fields.py
@@ -1,5 +1,5 @@
 import pytest
-from pygelf import GelfTcpHandler, GelfUdpHandler, GelfHttpHandler, GelfTlsHandler, GelfHttpsHandler
+from pygelf import GelfTcpHandler, GelfUdpHandler, GelfHttpHandler, GelfTlsHandler, GelfHttpsHandler, GelfTlsHandler
 from tests.helper import logger, get_unique_message, log_warning
 
 
@@ -17,15 +17,15 @@
     GelfHttpHandler(host='127.0.0.1', port=12203, **STATIC_FIELDS),
     GelfHttpHandler(host='127.0.0.1', port=12203, compress=False, **STATIC_FIELDS),
     GelfTlsHandler(host='127.0.0.1', port=12204, **STATIC_FIELDS),
-    # GelfTlsHandler(host='127.0.0.1', port=12204, validate=True, ca_certs='tests/config/cert.pem', **STATIC_FIELDS),
+    GelfTlsHandler(host='127.0.0.1', port=12204, validate=True, ca_certs='tests/config/cert.pem', **STATIC_FIELDS),
     GelfTcpHandler(host='127.0.0.1', port=12201, static_fields=STATIC_FIELDS, _ozzy='billie jean'),
     GelfUdpHandler(host='127.0.0.1', port=12202, static_fields=STATIC_FIELDS, _ozzy='billie jean'),
     GelfUdpHandler(host='127.0.0.1', port=12202, compress=False, static_fields=STATIC_FIELDS, _ozzy='billie jean'),
     GelfHttpHandler(host='127.0.0.1', port=12203, static_fields=STATIC_FIELDS, _ozzy='billie jean'),
     GelfHttpHandler(host='127.0.0.1', port=12203, compress=False, static_fields=STATIC_FIELDS, _ozzy='billie jean'),
     GelfTlsHandler(host='127.0.0.1', port=12204, static_fields=STATIC_FIELDS),
-    GelfHttpsHandler(host='127.0.0.1', port=12205, validate=False, static_fields=STATIC_FIELDS, _ozzy='billie jean')
-    # GelfTlsHandler(host='127.0.0.1', port=12204, validate=True, ca_certs='tests/config/cert.pem', static_fields=STATIC_FIELDS, _ozzy='billie jean'),
+    GelfHttpsHandler(host='127.0.0.1', port=12205, validate=False, static_fields=STATIC_FIELDS, _ozzy='billie jean'),
+    GelfTlsHandler(host='127.0.0.1', port=12204, validate=True, ca_certs='tests/config/cert.pem', static_fields=STATIC_FIELDS, _ozzy='billie jean'),
 ])
 def handler(request):
     return request.param