Changes import of testing server into nats.testing.server

Adds nkeys, aiohttp, aiofiles as development deps

CI updates to handle some older versions

Signed-off-by: Waldemar Quevedo <[email protected]>

Author: caspervonb

.github/workflows/test.yml

@@ -43,7 +43,7 @@ jobs:
             - name: Run tests
               run: |
                   uv run flake8 --ignore="W391, W503, W504, E501" ./nats/src/nats/js/
-                  uv run pytest -x -vv -s --continue-on-collection-errors ./nats/tests
+                  uv run pytest -x -vv -s --continue-on-collection-errors ./nats/tests --ignore=nats/tests/testing_server
               env:
                   PATH: $HOME/nats-server:$PATH
 
@@ -55,7 +55,6 @@ jobs:
                 python-version: ["3.11", "3.12", "3.13"]
                 os: ["ubuntu-latest", "macos-latest", "windows-latest"]
                 nats-server-version: ["latest"]
-                project: ["nats-server"]
         steps:
             - name: Checkout repository
               uses: actions/checkout@v5
@@ -80,8 +79,6 @@ jobs:
 
             - name: Install dependencies
               run: uv sync --dev
-              working-directory: ${{ matrix.project }}
 
             - name: Run tests for ${{ matrix.project }}
-              run: uv run pytest -v -n auto
-              working-directory: ${{ matrix.project }}
+              run: uv run pytest nats/tests/testing_server -x -s -v -n auto

nats-server/.DS_Store

@@ -0,0 +1 @@
+"""Testing utilities for NATS."""

nats-server/README.md

@@ -24,8 +24,12 @@
 import os
 import re
 import socket
-import tempfile
-from typing import Self
+import sys
+
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
 
 # Set up logging
 logger = logging.getLogger(__name__)
@@ -122,13 +126,12 @@ def client_url(self) -> str:
             The connect URL as a string.
         """
         # Replace bind-all addresses with loopback addresses
-        match self._host:
-            case "0.0.0.0":
-                host = "127.0.0.1"
-            case "::":
-                host = "::1"
-            case _:
-                host = self._host
+        if self._host == "0.0.0.0":
+            host = "127.0.0.1"
+        elif self._host == "::":
+            host = "::1"
+        else:
+            host = self._host
 
         # Wrap IPv6 addresses in brackets for URL formatting
         if ":" in host:
@@ -277,7 +280,8 @@ async def wait_ready() -> tuple[str, int]:
                 assert port is not None
                 return host, port
 
-            if match := LISTENING_PATTERN.search(stderr_line):
+            match = LISTENING_PATTERN.search(stderr_line)
+            if match:
                 host_part = match.group(1)
                 if host_part.startswith('[') and host_part.endswith(']'):
                     host = host_part[1:-1]
@@ -288,7 +292,8 @@ async def wait_ready() -> tuple[str, int]:
             if INFO_PATTERN.search(stderr_line):
                 continue
 
-            if match := FATAL_PATTERN.search(stderr_line):
+            match = FATAL_PATTERN.search(stderr_line)
+            if match:
                 error_lines.append(match.group(1))
 
             error_lines.append(stderr_line)

nats-server/pyproject.toml

@@ -6,6 +6,7 @@ COPY . /usr/src/nats.py
 # Install uv
 RUN pip install uv
 RUN uv sync --dev
+
 RUN uv run pytest nats/tests/test_compatibility.py --collect-only -v
 
 ENV NATS_URL=nats://localhost:4222

nats-server/tests/__init__.py

@@ -0,0 +1 @@
+"""Test package for NATS Server"""