style: lint changes

Author: fstr

tests/integration/conftest.py

@@ -1,12 +1,10 @@
-import pytest
 import os
 import socket
 import subprocess
 import uuid
-
 from logging import getLogger
 from os import environ, getenv
-from time import time, sleep
+from time import sleep, time
 from typing import Optional
 
 from pytest import fixture, mark
@@ -48,14 +46,21 @@ def pytest_addoption(parser):
         "--run-kind", action="store_true", help="Run integration tests against kind"
     )
     parser.addoption(
-        "--run-compose", action="store_true", help="Run integration tests against docker-compose"
+        "--run-compose",
+        action="store_true",
+        help="Run integration tests against docker-compose",
     )
 
 
 def pytest_configure(config):
     config.addinivalue_line("markers", "slow: mark test as slow to run")
-    config.addinivalue_line("markers", "kind_only: tests that require a Kubernetes/Kind environment")
-    config.addinivalue_line("markers", "dedicated_helm_install: Marker for tests that need a dedicated helm release installation")
+    config.addinivalue_line(
+        "markers", "kind_only: tests that require a Kubernetes/Kind environment"
+    )
+    config.addinivalue_line(
+        "markers",
+        "dedicated_helm_install: Marker for tests that need a dedicated helm release installation",
+    )
 
 
 def pytest_collection_modifyitems(config, items):
@@ -233,7 +238,7 @@ def pytest_generate_tests(metafunc):
 def get_free_port():
     """Ask the OS for a free ephemeral port."""
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-        s.bind(('', 0))
+        s.bind(("", 0))
         s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         return s.getsockname()[1]
 
@@ -256,30 +261,46 @@ def kind_cluster(request):
     clusters = result.stdout.splitlines()
 
     if KIND_CLUSTER_NAME in clusters:
-        print(f"\n[Kind] Cluster '{KIND_CLUSTER_NAME}' already exists. Skipping creation.")
+        print(
+            f"\n[Kind] Cluster '{KIND_CLUSTER_NAME}' already exists. Skipping creation."
+        )
     else:
         print(f"\n[Kind] Creating cluster '{KIND_CLUSTER_NAME}'...")
-        subprocess.run([
-            "kind", "create", "cluster",
-            "--name", KIND_CLUSTER_NAME,
-            "--config", "kind.yaml",
-            "--wait", "5m"
-        ], check=True)
+        subprocess.run(
+            [
+                "kind",
+                "create",
+                "cluster",
+                "--name",
+                KIND_CLUSTER_NAME,
+                "--config",
+                "kind.yaml",
+                "--wait",
+                "5m",
+            ],
+            check=True,
+        )
 
     context = f"kind-{KIND_CLUSTER_NAME}"
     yield context
 
     # Optional: Only delete when running in CI
     if os.getenv("GITHUB_ACTIONS") == "true":
         print(f"\n[Kind] CI detected: Deleting cluster '{KIND_CLUSTER_NAME}'...")
-        subprocess.run(["kind", "delete", "cluster", "--name", KIND_CLUSTER_NAME], check=True)
+        subprocess.run(
+            ["kind", "delete", "cluster", "--name", KIND_CLUSTER_NAME], check=True
+        )
     else:
-        print(f"\n[Kind] Local: Cluster '{KIND_CLUSTER_NAME}' will be kept for next session.")
+        print(
+            f"\n[Kind] Local: Cluster '{KIND_CLUSTER_NAME}' will be kept for next session."
+        )
 
 
 def deploy_app(kind_cluster, helm_values=None):
     """Common logic for both session and function-scoped setups."""
-    test_id = f"{os.environ.get('PYTEST_XDIST_WORKER', 'python-sdk')}-{uuid.uuid4().hex[:4]}"
+    test_id = (
+        f"{os.environ.get('PYTEST_XDIST_WORKER', 'python-sdk')}-{uuid.uuid4().hex[:4]}"
+    )
     release, ns = f"core-{test_id}", f"ns-{test_id}"
     local_port = get_free_port()
 
@@ -297,26 +318,62 @@ def deploy_app(kind_cluster, helm_values=None):
             set_args.extend(["--set", f"{key}={value}"])
 
     print(f"[Kind] Installing Helm release {release} into namespace {ns}...")
-    subprocess.run([
-        "helm", "install", release,
-        "oci://ghcr.io/firebolt-db/helm-charts/firebolt-core",
-        "--version", getenv(CORE_HELM_CHART_VERSION_ENV, CORE_DEFAULT_HELM_CHART_VERSION),
-        "-n", ns,
-        "--create-namespace", "--wait", "--kube-context", kind_cluster
-    ]+ set_args, check=True)
+    subprocess.run(
+        [
+            "helm",
+            "install",
+            release,
+            "oci://ghcr.io/firebolt-db/helm-charts/firebolt-core",
+            "--version",
+            getenv(CORE_HELM_CHART_VERSION_ENV, CORE_DEFAULT_HELM_CHART_VERSION),
+            "-n",
+            ns,
+            "--create-namespace",
+            "--wait",
+            "--kube-context",
+            kind_cluster,
+        ]
+        + set_args,
+        check=True,
+    )
 
     print(f"[Kind] Waiting for pods in {ns} to be ready...")
-    subprocess.run([
-        "kubectl", "wait", "--for=condition=ready", "pod",
-        "-l", "app.kubernetes.io/instance=" + release, # Adjust label to match your chart
-        "--namespace", ns, "--timeout=120s", "--context", kind_cluster
-    ], check=True)
+    subprocess.run(
+        [
+            "kubectl",
+            "wait",
+            "--for=condition=ready",
+            "pod",
+            "-l",
+            "app.kubernetes.io/instance=" + release,  # Adjust label to match your chart
+            "--namespace",
+            ns,
+            "--timeout=120s",
+            "--context",
+            kind_cluster,
+        ],
+        check=True,
+    )
 
     # Get pod names
-    pod_names_result = subprocess.run([
-        "kubectl", "get", "pods", "-l", "app.kubernetes.io/instance=" + release,
-        "-n", ns, "-o", "jsonpath={.items[*].metadata.name}", "--context", kind_cluster
-    ], capture_output=True, text=True, check=True)
+    pod_names_result = subprocess.run(
+        [
+            "kubectl",
+            "get",
+            "pods",
+            "-l",
+            "app.kubernetes.io/instance=" + release,
+            "-n",
+            ns,
+            "-o",
+            "jsonpath={.items[*].metadata.name}",
+            "--context",
+            kind_cluster,
+        ],
+        capture_output=True,
+        text=True,
+        check=True,
+    )
     pod_names = pod_names_result.stdout.split()
 
     pf_procs = []
@@ -325,12 +382,23 @@ def deploy_app(kind_cluster, helm_values=None):
         ip = "127.0.0.1"
         port = local_port + i
         ips_with_ports.append(f"{ip}:{port}")
-        print(f"[Kind] Port-forward to pod {pod_name} on {ip}:{port}->{FIREBOLT_CORE_PORT}...")
-        pf_proc = subprocess.Popen([
-            "kubectl", "port-forward", "--address", ip,
-            f"pod/{pod_name}",
-            f"{port}:{FIREBOLT_CORE_PORT}", "-n", ns, "--context", kind_cluster
-        ])
+        print(
+            f"[Kind] Port-forward to pod {pod_name} on {ip}:{port}->{FIREBOLT_CORE_PORT}..."
+        )
+        pf_proc = subprocess.Popen(
+            [
+                "kubectl",
+                "port-forward",
+                "--address",
+                ip,
+                f"pod/{pod_name}",
+                f"{port}:{FIREBOLT_CORE_PORT}",
+                "-n",
+                ns,
+                "--context",
+                kind_cluster,
+            ]
+        )
         pf_procs.append(pf_proc)
 
     sleep(1)
@@ -362,16 +430,26 @@ def deploy_app(kind_cluster, helm_values=None):
         "processes": pf_procs,
         "release": release,
         "ns": ns,
-        "ips": ips_with_ports
+        "ips": ips_with_ports,
     }
 
 
 def cleanup_app(setup_data, kind_cluster):
     """Common teardown logic."""
     for proc in setup_data["processes"]:
         proc.terminate()
-    subprocess.run(["helm", "uninstall", setup_data["release"], "-n",
-                    setup_data["ns"], "--kube-context", kind_cluster], check=True)
+    subprocess.run(
+        [
+            "helm",
+            "uninstall",
+            setup_data["release"],
+            "-n",
+            setup_data["ns"],
+            "--kube-context",
+            kind_cluster,
+        ],
+        check=True,
+    )
     subprocess.run(["kubectl", "delete", "ns", setup_data["ns"]], check=True)
 
 
@@ -414,7 +492,11 @@ def kind_app_setup(request, session_helm_install, dedicated_helm_install):
     Dynamically injects the required environment variables from whichever kind setup is active.
     """
     # Use dedicated if it exists (not None), otherwise fall back to session
-    active_setup = dedicated_helm_install if dedicated_helm_install is not None else session_helm_install
+    active_setup = (
+        dedicated_helm_install
+        if dedicated_helm_install is not None
+        else session_helm_install
+    )
 
     if active_setup:
         if active_setup == dedicated_helm_install:
@@ -436,7 +518,7 @@ def kind_app_setup(request, session_helm_install, dedicated_helm_install):
             "SERVICE_ID": "",
             "SERVICE_SECRET": "",
             "ENGINE_URL": "",
-            "CORE_IPS": ",".join(ips)
+            "CORE_IPS": ",".join(ips),
         }
         old_env = {k: os.environ.get(k) for k in env_vars}
         os.environ.update(env_vars)
@@ -445,7 +527,9 @@ def kind_app_setup(request, session_helm_install, dedicated_helm_install):
 
         # Restore env
         for k, v in old_env.items():
-            if v is None: os.environ.pop(k, None)
-            else: os.environ[k] = v
+            if v is None:
+                os.environ.pop(k, None)
+            else:
+                os.environ[k] = v
     else:
         yield "docker-compose"