tests/pytests: ruff linter fixes

CZ-NIC · Oct 15, 2024 · a61d2e9 · a61d2e9
1 parent 46dddac
commit a61d2e9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/tests/pytests/kresd.py b/tests/pytests/kresd.py
@@ -48,7 +48,7 @@ def create_file_from_template(template_path, dest, data):
 
 
 class Kresd(ContextDecorator):
-    def __init__(
+    def __init__(  # noqa: PLR0913
             self, workdir, port=None, tls_port=None, ip=None, ip6=None, certname=None,
             verbose=True, hints=None, forward=None, policy_test_pass=False, rr=False,
             valgrind=False):
@@ -237,13 +237,12 @@ def partial_log(self):
             for line in log:
                 if past_startup:
                     partial_log += line
-                else:  # find real start of test log (after initial alive-pings)
-                    if not past_startup_msgid:
-                        if re.match(KRESD_LOG_STARTUP_MSGID, line) is not None:
-                            past_startup_msgid = True
-                    else:
-                        if re.match(KRESD_LOG_IO_CLOSE, line) is not None:
-                            past_startup = True
+                # find real start of test log (after initial alive-pings)
+                elif not past_startup_msgid:
+                    if re.match(KRESD_LOG_STARTUP_MSGID, line) is not None:
+                        past_startup_msgid = True
+                elif re.match(KRESD_LOG_IO_CLOSE, line) is not None:
+                    past_startup = True
         return partial_log
 
 

diff --git a/tests/pytests/proxy.py b/tests/pytests/proxy.py
@@ -82,7 +82,7 @@ def __exit__(self, exc_type, exc_value, traceback):
 class TLSProxy(Proxy):
     EXECUTABLE = 'tlsproxy'
 
-    def __init__(
+    def __init__(  # noqa: PLR0913
                 self,
                 local_ip: str = '127.0.0.1',
                 local_port: Optional[int] = None,
@@ -130,9 +130,9 @@ def kresd_tls_client(
             kresd_fwd_target_kwargs: Optional[Dict[Any, Any]] = None
         ) -> Kresd:
     """kresd_tls_client --(tls)--> tlsproxy --(tcp)--> kresd_fwd_target"""
-    ALLOWED_IPS = {'127.0.0.1', '::1'}
-    assert proxy.local_ip in ALLOWED_IPS, "only localhost IPs supported for proxy"
-    assert proxy.upstream_ip in ALLOWED_IPS, "only localhost IPs are supported for proxy"
+    allowed_ips = {'127.0.0.1', '::1'}
+    assert proxy.local_ip in allowed_ips, "only localhost IPs supported for proxy"
+    assert proxy.upstream_ip in allowed_ips, "only localhost IPs are supported for proxy"
 
     if kresd_tls_client_kwargs is None:
         kresd_tls_client_kwargs = {}