add database.port to settings.py, and update conftest

Author: d-v-b

src/datajoint/settings.py

@@ -278,6 +278,7 @@ def __setitem__(self, key, value):
             "database.host",
             "database.user",
             "database.password",
+            "database.port",
             "external.aws_access_key_id",
             "external.aws_secret_access_key",
             "loglevel",
@@ -288,6 +289,7 @@ def __setitem__(self, key, value):
                 "DJ_HOST",
                 "DJ_USER",
                 "DJ_PASS",
+                "DJ_PORT",
                 "DJ_AWS_ACCESS_KEY_ID",
                 "DJ_AWS_SECRET_ACCESS_KEY",
                 "DJ_LOG_LEVEL",
@@ -296,6 +298,14 @@ def __setitem__(self, key, value):
     )
     if v is not None
 }
+
+# Convert DJ_PORT from string to int if present
+if "database.port" in mapping and mapping["database.port"] is not None:
+    try:
+        mapping["database.port"] = int(mapping["database.port"])
+    except ValueError:
+        logger.warning(f"Invalid DJ_PORT value: {mapping['database.port']}, using default port 3306")
+        del mapping["database.port"]
 if mapping:
     logger.info(f"Overloaded settings {tuple(mapping)} from environment variables.")
     config.update(mapping)

tests/conftest.py

@@ -34,6 +34,18 @@
 logger = logging.getLogger(__name__)
 
 
+def pytest_sessionstart(session):
+    """Called after the Session object has been created and configured."""
+    # This runs very early, before most fixtures, but we don't have container info yet
+    pass
+
+
+def pytest_configure(config):
+    """Called after command line options have been parsed."""
+    # This runs before pytest_sessionstart but still too early for containers
+    pass
+
+
 
 
 # Global container registry for cleanup
@@ -313,17 +325,30 @@ def db_creds_test(mysql_container) -> Dict:
     )
 
 
-@pytest.fixture(scope="session")
-def db_creds_root(mysql_container) -> Dict:
+@pytest.fixture(scope="session", autouse=True)
+def configure_datajoint_for_containers(mysql_container):
+    """Configure DataJoint to use pytest-managed containers. Runs automatically for all tests."""
     _, host, port = mysql_container
-    # Set environment variables for DataJoint at module level
+
+    # Set environment variables FIRST - these will be inherited by subprocesses
+    logger.info(f"🔧 Setting environment: DJ_HOST={host}, DJ_PORT={port}")
     os.environ["DJ_HOST"] = host
     os.environ["DJ_PORT"] = str(port)
 
-    # Also update DataJoint's configuration directly
+    # Verify the environment variables were set
+    logger.info(f"🔧 Environment after setting: DJ_HOST={os.environ.get('DJ_HOST')}, DJ_PORT={os.environ.get('DJ_PORT')}")
+
+    # Also update DataJoint's configuration directly for in-process connections
     dj.config["database.host"] = host
     dj.config["database.port"] = port
 
+    logger.info(f"🔧 Configured DataJoint to use MySQL container at {host}:{port}")
+    return host, port  # Return values so other fixtures can use them
+
+
+@pytest.fixture(scope="session")
+def db_creds_root(mysql_container) -> Dict:
+    _, host, port = mysql_container
     return dict(
         host=f"{host}:{port}",
         user=os.getenv("DJ_USER", "root"),