Changeset 5357109 in mod_gnutls

Timestamp:

Oct 8, 2020, 3:28:49 PM (10 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master

Children:

83b5bf6

Parents:

c26a163

Message:

Fix flake8 warnings in test hooks.py

Location:

test/tests

Files:

• 06_invalid_plaintext/hooks.py (modified) (3 diffs)
• 14_resume_session/hooks.py (modified) (1 diff)
• 15_basic_msva/hooks.py (modified) (1 diff)
• 16_view-status/hooks.py (modified) (1 diff)
• 24_pkcs11_cert/hooks.py (modified) (2 diffs)
• 27_OCSP_server/hooks.py (modified) (1 diff)
• 28_HTTP2_support/hooks.py (modified) (3 diffs)
• 30_ip_based_vhosts/hooks.py (modified) (1 diff)
• 34_TLS_reverse_proxy_h2/hooks.py (modified) (1 diff)
• 36_OCSP_server_nonce/hooks.py (modified) (1 diff)

test/tests/06_invalid_plaintext/hooks.py

@@ -13 +13 @@
 class TLSRecord:
     header = struct.Struct('!BHH')
+
     def __init__(self, data):
         self.type, self.legacy_proto, self.length = \
@@ -48 +49 @@
     """Send an HTTPS request and then plaintext on the same TCP connection"""
     with contextlib.ExitStack() as stack:
-        s = stack.enter_context(socket.socket(socket.AF_INET, socket.SOCK_STREAM))
+        s = stack.enter_context(
+            socket.socket(socket.AF_INET, socket.SOCK_STREAM))
         s.connect((host, port))
 
@@ -64 +66 @@
         buf = bytearray(2048)
         pos = 0
-        while not CRLF in buf:
+        while CRLF not in buf:
             received = tls_sock.recv_into(memoryview(buf)[pos:])
             # If we get 0 it means the connection ended before the

test/tests/14_resume_session/hooks.py

@@ -1 +1 @@
 import re
 from mgstest import require_match
+
 
 def post_check(conn_log, response_log):

test/tests/15_basic_msva/hooks.py

@@ -1 +1 @@
 import os
 from unittest import SkipTest
+
 
 def prepare_env():

test/tests/16_view-status/hooks.py

@@ -1 +1 @@
 from mgstest import require_match, TestExpectationFailed
 import re
+
 
 def post_check(conn_log, response_log):

test/tests/24_pkcs11_cert/hooks.py

@@ -4 +4 @@
 from pathlib import Path
 from unittest import SkipTest
+
 
 def prepare_env():
@@ -11 +12 @@
     db = 'authority/server/softhsm2.db'
     softhsm_conf = mgstest.softhsm.tmp_softhsm_conf(db)
+
     def cleanup():
         print(f'Delete {softhsm_conf}')

test/tests/27_OCSP_server/hooks.py

@@ -4 +4 @@
 from unittest import SkipTest
 
+
 def prepare_env():
-    if not 'OCSP_PORT' in os.environ:
+    if 'OCSP_PORT' not in os.environ:
         raise SkipTest('OCSP_PORT is not set, check if openssl is available.')
+
 
 def post_check(conn_log, response_log):

test/tests/28_HTTP2_support/hooks.py

@@ -4 +4 @@
 from mgstest import require_apache_modules, require_match
 from unittest import SkipTest
+
 
 def prepare_env():
@@ -14 +15 @@
     if not re.search(r'\bHTTP2\b', proc.stdout):
         raise SkipTest(f'{curl} does not support HTTP/2!')
+
 
 def run_connection(testname, conn_log, response_log):
@@ -32 +34 @@
     proc.check_returncode()
 
+
 def post_check(conn_log, response_log):
     print('Checking for HTTP/2 in logged header:')

test/tests/30_ip_based_vhosts/hooks.py

@@ -1 +1 @@
 import os
 from unittest import SkipTest
+
 
 def prepare_env():

test/tests/34_TLS_reverse_proxy_h2/hooks.py

@@ -1 +1 @@
 import mgstest
+
 
 def prepare_env():

test/tests/36_OCSP_server_nonce/hooks.py

@@ -43 +43 @@
         while ocsp_request is None:
             log_match = require_match(
-                    re.compile(r"Received OCSP request: '([^']*)'"),
-                    log
-                )
+                re.compile(r"Received OCSP request: '([^']*)'"), log)
             test_request = OCSPRequest.parse_str(
-                            base64.b64decode(log_match.group(1)))
+                base64.b64decode(log_match.group(1)))
             print(repr(test_request))
             if ocsp_response.matches_request(test_request):