Standardized test configuration

Author: hoijnet

terminusdb_client/tests/integration_tests/conftest.py

@@ -12,20 +12,17 @@
 def is_local_server_running():
     """Check if local TerminusDB server is running at http://127.0.0.1:6363"""
     try:
-        response = requests.get("http://127.0.0.1:6363", timeout=2)
-        # Server responds with 200 (success) or 404 (not found but server is up)
-        # 401 (unauthorized) also indicates server is running but needs auth
-        return response.status_code in [200, 404]
+        response = requests.get("http://127.0.0.1:6363/api/ok", timeout=2)
+        return response.status_code == 200
     except (requests.exceptions.ConnectionError, requests.exceptions.Timeout):
         return False
 
 
 def is_docker_server_running():
-    """Check if Docker TerminusDB server is already running at http://127.0.0.1:6366"""
+    """Check if Docker TerminusDB server is already running at http://127.0.0.1:6363"""
     try:
-        response = requests.get("http://127.0.0.1:6366", timeout=2)
-        # Server responds with 404 for root path, which means it's running
-        return response.status_code in [200, 404]
+        response = requests.get("http://127.0.0.1:6363/api/ok", timeout=2)
+        return response.status_code == 200
     except (requests.exceptions.ConnectionError, requests.exceptions.Timeout):
         return False
 
@@ -143,33 +140,19 @@ def docker_url_jwt(pytestconfig):
 def docker_url(pytestconfig):
     """
     Provides a TerminusDB server URL for integration tests.
-    Prefers local test server if running, otherwise starts Docker container.
-
-    NOTE: This fixture returns just the URL. Tests expect AUTOLOGIN mode (no authentication).
-    If using local server with authentication, use TERMINUSDB_AUTOLOGIN=true when starting it.
+    Uses port 6363 with admin:root authentication by default.
+    Prefers an already-running server, otherwise starts a Docker container.
     """
-    # Check if local test server is already running (port 6363)
+    # Check if a server is already running (port 6363)
     if is_local_server_running():
         print(
-            "\n✓ Using existing local TerminusDB test server at http://127.0.0.1:6363"
-        )
-        print(
-            "⚠️  WARNING: Local server should be started with TERMINUSDB_AUTOLOGIN=true"
-        )
-        print(
-            "   Or use: TERMINUSDB_SERVER_AUTOLOGIN=true ./tests/terminusdb-test-server.sh restart"
+            "\n✓ Using existing TerminusDB server at http://127.0.0.1:6363"
         )
         yield "http://127.0.0.1:6363"
         return  # Don't clean up - server was already running
 
-    # Check if Docker container is already running (port 6366)
-    if is_docker_server_running():
-        print("\n✓ Using existing Docker TerminusDB server at http://127.0.0.1:6366")
-        yield "http://127.0.0.1:6366"
-        return  # Don't clean up - server was already running
-
     # No server found, start Docker container
-    print("\n⚠ No server found, starting Docker container with AUTOLOGIN...")
+    print("\n⚠ No server found, starting Docker container...")
     pytestconfig.getoption("docker_compose")
     output = subprocess.run(
         [
@@ -185,7 +168,7 @@ def docker_url(pytestconfig):
     if output.returncode != 0:
         raise RuntimeError(output.stderr)
 
-    test_url = "http://127.0.0.1:6366"
+    test_url = "http://127.0.0.1:6363"
     is_server_started = False
 
     seconds_waited = 0

terminusdb_client/tests/integration_tests/test-docker-compose.yml

@@ -9,21 +9,27 @@ services:
     hostname: terminusdb-server
     tty: true
     ports:
-      - 6366:6366
+      - 6363:6363
     environment:
       - TERMINUSDB_SERVER_NAME=http://127.0.0.1
-      - TERMINUSDB_SERVER_PORT=6366
+      - TERMINUSDB_SERVER_PORT=6363
 
       # There are multiple ways to configure TerminusDB security through
       # environment variables. Several reasonable options are included below.
       # Uncomment the option you decide on and comment out others.
       # Don't forget to change the default password!
 
-      # Security Option 1 (default): Assumes TerminusDB is only accessible from
+      # Security Option 1 (default): Use a password for the login 
+      - TERMINUSDB_ADMIN_PASS=root
+      - TERMINUSDB_AUTOLOGIN=false
+      - TERMINUSDB_SERVER_PORT=6363
+      - TERMINUSDB_HTTPS_ENABLED=false
+
+      # Security Option 2: Assumes TerminusDB is only accessible from
       # the machine it's running on and all access to port 6363 is considered
       # authorized.
-      - TERMINUSDB_HTTPS_ENABLED=false
-      - TERMINUSDB_AUTOLOGIN=true
+      # - TERMINUSDB_HTTPS_ENABLED=false
+      # - TERMINUSDB_AUTOLOGIN=true
 
       # Security Option 2: TerminusDB is set up behind a TLS-terminating reverse
       # proxy with admin authentication provided by password.

terminusdb_client/tests/integration_tests/test_conftest.py

@@ -21,16 +21,16 @@ def test_local_server_running_200(self, mock_get):
         mock_get.return_value = mock_response
 
         assert is_local_server_running() is True
-        mock_get.assert_called_once_with("http://127.0.0.1:6363", timeout=2)
+        mock_get.assert_called_once_with("http://127.0.0.1:6363/api/ok", timeout=2)
 
     @patch("terminusdb_client.tests.integration_tests.conftest.requests.get")
-    def test_local_server_running_404(self, mock_get):
-        """Test local server detection returns True for HTTP 404"""
+    def test_local_server_running_not_200(self, mock_get):
+        """Test local server detection returns False for non-200 status"""
         mock_response = Mock()
         mock_response.status_code = 404
         mock_get.return_value = mock_response
 
-        assert is_local_server_running() is True
+        assert is_local_server_running() is False
 
     @patch("terminusdb_client.tests.integration_tests.conftest.requests.get")
     def test_local_server_not_running_connection_error(self, mock_get):
@@ -54,16 +54,16 @@ def test_docker_server_running_200(self, mock_get):
         mock_get.return_value = mock_response
 
         assert is_docker_server_running() is True
-        mock_get.assert_called_once_with("http://127.0.0.1:6366", timeout=2)
+        mock_get.assert_called_once_with("http://127.0.0.1:6363/api/ok", timeout=2)
 
     @patch("terminusdb_client.tests.integration_tests.conftest.requests.get")
-    def test_docker_server_running_404(self, mock_get):
-        """Test Docker server detection returns True for HTTP 404"""
+    def test_docker_server_running_not_200(self, mock_get):
+        """Test Docker server detection returns False for non-200 status"""
         mock_response = Mock()
         mock_response.status_code = 404
         mock_get.return_value = mock_response
 
-        assert is_docker_server_running() is True
+        assert is_docker_server_running() is False
 
     @patch("terminusdb_client.tests.integration_tests.conftest.requests.get")
     def test_docker_server_not_running(self, mock_get):

terminusdb_client/tests/test_Schema.py

@@ -200,7 +200,7 @@ def test_embedded_object(test_schema):
         ),
         friend_of={Person(name="Katy", age=51)},
     )
-    client = Client("http://127.0.0.1:6366")
+    client = Client("http://127.0.0.1:6363")
     result = client._convert_document(gavin, "instance")
     # Finds the internal object and splays it out properly
     assert len(result) == 2
@@ -334,11 +334,11 @@ def test_compress_data(patched, patched2, patched3, patched4):
         weeks=2,
     )
     test_obj = [CheckDatetime(datetime=datetime_obj, duration=delta) for _ in range(10)]
-    client = Client("http://127.0.0.1:6366")
+    client = Client("http://127.0.0.1:6363")
     client.connect(db="test_compress_data")
     client.insert_document(test_obj, compress=0)
     client._session.post.assert_called_once_with(
-        "http://127.0.0.1:6366/api/document/admin/test_compress_data/local/branch/main",
+        "http://127.0.0.1:6363/api/document/admin/test_compress_data/local/branch/main",
         auth=("admin", "root"),
         headers={
             "user-agent": f"terminusdb-client-python/{__version__}",
@@ -357,7 +357,7 @@ def test_compress_data(patched, patched2, patched3, patched4):
     client._session.post.reset_mock()
     client.insert_document(test_obj, compress="never")
     client._session.post.assert_called_once_with(
-        "http://127.0.0.1:6366/api/document/admin/test_compress_data/local/branch/main",
+        "http://127.0.0.1:6363/api/document/admin/test_compress_data/local/branch/main",
         auth=("admin", "root"),
         headers={"user-agent": f"terminusdb-client-python/{__version__}"},
         params={
@@ -371,7 +371,7 @@ def test_compress_data(patched, patched2, patched3, patched4):
     )
     client.replace_document(test_obj, compress=0)
     client._session.put.assert_called_once_with(
-        "http://127.0.0.1:6366/api/document/admin/test_compress_data/local/branch/main",
+        "http://127.0.0.1:6363/api/document/admin/test_compress_data/local/branch/main",
         auth=("admin", "root"),
         headers={
             "user-agent": f"terminusdb-client-python/{__version__}",
@@ -390,7 +390,7 @@ def test_compress_data(patched, patched2, patched3, patched4):
     client._session.put.reset_mock()
     client.replace_document(test_obj, compress="never")
     client._session.put.assert_called_once_with(
-        "http://127.0.0.1:6366/api/document/admin/test_compress_data/local/branch/main",
+        "http://127.0.0.1:6363/api/document/admin/test_compress_data/local/branch/main",
         auth=("admin", "root"),
         headers={"user-agent": f"terminusdb-client-python/{__version__}"},
         params={