test: Update testing settings to use unique port numbers for each par…

…allel test environment to avoid collisions when running via tox

pyproject.toml

@@ -303,9 +303,12 @@ task-tags = ["FIXME", "FUTURE", "RELIC", "TODO"]
 [tool.ruff.lint.isort]
 force-sort-within-sections = false
 known-first-party = [
-  "conftest",
   "tekhsi"
 ]
+known-local-folder = [
+  "server",
+  "tests"
+]
 lines-between-types = 1
 order-by-type = false
 

tests/conftest.py

@@ -17,6 +17,8 @@
 from tekhsi._tek_highspeed_server_pb2_grpc import ConnectStub
 from tekhsi.tek_hsi_connect import TekHSIConnect
 
+from server.tekhsi_test_server import TEST_SERVER_ADDRESS, TEST_SERVER_PORT_NUMBER
+
 PROJECT_ROOT_DIR = Path(__file__).parent.parent
 
 
@@ -36,7 +38,7 @@ def data_arrival(waveforms: List[DerivedWaveform]):
 
 
 class TestServerManager:
-    def __init__(self, port=5000):
+    def __init__(self, port=TEST_SERVER_PORT_NUMBER):
         """Initialize the TestServerManager with a specified port."""
         self.server_process = None
         self.port = port
@@ -126,7 +128,7 @@ def expected_header():
 @pytest.fixture()
 def grpc_channel():  # pylint: disable=useless-suppression
     """Create a gRPC channel to the test server."""
-    channel = grpc.insecure_channel("localhost:5000")
+    channel = grpc.insecure_channel(TEST_SERVER_ADDRESS)
     yield channel
     channel.close()
 
@@ -147,4 +149,4 @@ def start_test_server():
 @pytest.fixture()
 def tekhsi_client():
     """Create a TekHSIConnect client."""
-    return TekHSIConnect("localhost:5000")
+    return TekHSIConnect(TEST_SERVER_ADDRESS)

tests/server/tekhsi_test_server.py

@@ -32,6 +32,9 @@
 server = None
 acq_id = 0
 
+TEST_SERVER_PORT_NUMBER = int(f"5{sys.version_info.major}{sys.version_info.minor}")
+TEST_SERVER_ADDRESS = f"localhost:{TEST_SERVER_PORT_NUMBER}"
+
 
 class WfmDataType(Enum):
     Int8 = 1
@@ -737,7 +740,7 @@ def serve():
     try:
         if verbose:
             print("Server Startup Request")
-        server.add_insecure_port("[::]:5000")
+        server.add_insecure_port(f"[::]:{TEST_SERVER_PORT_NUMBER}")
         server.start()
         time.sleep(2)
         if verbose: