Make tests run again. Remove cloud dependency.

Author: hoijnet

terminusdb_client/tests/integration_tests/conftest.py

@@ -5,7 +5,37 @@
 import pytest
 import requests
 
-MAX_CONTAINER_STARTUP_TIME = 30
+MAX_CONTAINER_STARTUP_TIME = 120  # Increased from 30 to 120 seconds for slower systems
+
+# Check if a local TerminusDB test server is already running
+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 404 for root path, which means it's running
+        return response.status_code in [200, 404]
+    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"""
+    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]
+    except (requests.exceptions.ConnectionError, requests.exceptions.Timeout):
+        return False
+
+
+def is_jwt_server_running():
+    """Check if JWT Docker TerminusDB server is already running at http://127.0.0.1:6367"""
+    try:
+        response = requests.get("http://127.0.0.1:6367", timeout=2)
+        # Server responds with 404 for root path, which means it's running
+        return response.status_code in [200, 404]
+    except (requests.exceptions.ConnectionError, requests.exceptions.Timeout):
+        return False
 
 
 def is_docker_installed():
@@ -39,6 +69,13 @@ def docker_url_jwt(pytestconfig):
     # we are using subprocess in case we need to access some of the outputs
     # most likely
     jwt_token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6InRlc3RrZXkifQ.eyJodHRwOi8vdGVybWludXNkYi5jb20vc2NoZW1hL3N5c3RlbSNhZ2VudF9uYW1lIjoiYWRtaW4iLCJodHRwOi8vdGVybWludXNkYi5jb20vc2NoZW1hL3N5c3RlbSN1c2VyX2lkZW50aWZpZXIiOiJhZG1pbkB1c2VyLmNvbSIsImlzcyI6Imh0dHBzOi8vdGVybWludXNodWIuZXUuYXV0aDAuY29tLyIsInN1YiI6ImFkbWluIiwiYXVkIjpbImh0dHBzOi8vdGVybWludXNodWIvcmVnaXN0ZXJVc2VyIiwiaHR0cHM6Ly90ZXJtaW51c2h1Yi5ldS5hdXRoMC5jb20vdXNlcmluZm8iXSwiaWF0IjoxNTkzNzY5MTgzLCJhenAiOiJNSkpuZEdwMHpVZE03bzNQT1RRUG1SSkltWTJobzBhaSIsInNjb3BlIjoib3BlbmlkIHByb2ZpbGUgZW1haWwifQ.Ru03Bi6vSIQ57bC41n6fClSdxlb61m0xX6Q34Yh91gql0_CyfYRWTuqzqPMFoCefe53hPC5E-eoSFdID_u6w1ih_pH-lTTqus9OWgi07Qou3QNs8UZBLiM4pgLqcBKs0N058jfg4y6h9GjIBGVhX9Ni2ez3JGNcz1_U45BhnreE"
+    
+    # Check if JWT server is already running (port 6367)
+    if is_jwt_server_running():
+        print("\n✓ Using existing JWT Docker TerminusDB server at http://127.0.0.1:6367")
+        yield ("http://127.0.0.1:6367", jwt_token)
+        return  # Don't clean up - server was already running
+    
     pytestconfig.getoption("docker_compose")
     output = subprocess.run(
         [
@@ -77,7 +114,8 @@ def docker_url_jwt(pytestconfig):
         if service.stdout == b"terminusdb-server\n":
             try:
                 response = requests.get(test_url)
-                assert response.status_code == 200
+                # Server responds with 404 for root path, which means it's running
+                assert response.status_code in [200, 404]
                 break
             except (requests.exceptions.ConnectionError, AssertionError):
                 pass
@@ -87,16 +125,37 @@ def docker_url_jwt(pytestconfig):
 
         if seconds_waited > MAX_CONTAINER_STARTUP_TIME:
             clean_up_container()
-            raise RuntimeError("Container was to slow to startup")
+            raise RuntimeError(f"JWT Container was too slow to startup (waited {MAX_CONTAINER_STARTUP_TIME}s)")
 
     yield (test_url, jwt_token)
     clean_up_container()
 
 
 @pytest.fixture(scope="module")
 def docker_url(pytestconfig):
-    # we are using subprocess in case we need to access some of the outputs
-    # most likely
+    """
+    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.
+    """
+    # Check if local test 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")
+        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...")
     pytestconfig.getoption("docker_compose")
     output = subprocess.run(
         [
@@ -134,7 +193,9 @@ def docker_url(pytestconfig):
         if service.stdout == b"terminusdb-server\n":
             try:
                 response = requests.get(test_url)
-                assert response.status_code == 200
+                # Server responds with 404 for root path, which means it's running
+                assert response.status_code in [200, 404]
+                print(f"✓ Docker container started successfully after {seconds_waited}s")
                 break
             except (requests.exceptions.ConnectionError, AssertionError):
                 pass
@@ -144,7 +205,7 @@ def docker_url(pytestconfig):
 
         if seconds_waited > MAX_CONTAINER_STARTUP_TIME:
             clean_up_container()
-            raise RuntimeError("Container was to slow to startup")
+            raise RuntimeError(f"Container was too slow to startup (waited {MAX_CONTAINER_STARTUP_TIME}s)")
 
     yield test_url
     clean_up_container()

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

@@ -1,5 +1,3 @@
-version: "3"
-
 volumes:
   terminusdb_storage:
 

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

@@ -1,5 +1,3 @@
-version: "3"
-
 volumes:
   terminusdb_storage:
 

terminusdb_client/tests/integration_tests/test_client.py

@@ -414,25 +414,16 @@ def test_diff_ops(docker_url, test_schema):
     client = Client(docker_url, user_agent=test_user_agent)
     client.connect(user="admin", team="admin")
     client.create_database("test_diff_ops")
-    public_diff = Client(
-        "https://cloud.terminusdb.com/jsondiff", user_agent=test_user_agent
-    )
-    public_patch = Client(
-        "https://cloud.terminusdb.com/jsonpatch", user_agent=test_user_agent
-    )
+    # NOTE: Public API endpoints (jsondiff/jsonpatch) no longer exist
+    # Testing authenticated diff/patch only
     result_patch = Patch(
         json='{"@id": "Person/Jane", "name" : { "@op" : "SwapValue", "@before" : "Jane", "@after": "Janine" }}'
     )
     result = client.diff(
         {"@id": "Person/Jane", "@type": "Person", "name": "Jane"},
         {"@id": "Person/Jane", "@type": "Person", "name": "Janine"},
     )
-    public_result = public_diff.diff(
-        {"@id": "Person/Jane", "@type": "Person", "name": "Jane"},
-        {"@id": "Person/Jane", "@type": "Person", "name": "Janine"},
-    )
     assert result.content == result_patch.content
-    assert public_result.content == result_patch.content
 
     Person = test_schema.object.get("Person")
     jane = Person(
@@ -446,7 +437,6 @@ def test_diff_ops(docker_url, test_schema):
         age=18,
     )
     result = client.diff(jane, janine)
-    public_result = public_diff.diff(jane, janine)
     # test commit_id and data_version with after obj
     test_schema.commit(client)
     jane_id = client.insert_document(jane)[0]
@@ -466,7 +456,6 @@ def test_diff_ops(docker_url, test_schema):
     commit_id_result_all = client.diff(current_commit, new_commit)
     data_version_result_all = client.diff(data_version, new_data_version)
     assert result.content == result_patch.content
-    assert public_result.content == result_patch.content
     assert commit_id_result.content == result_patch.content
     assert commit_id_result2.content == result_patch.content
     assert data_version_result.content == result_patch.content
@@ -476,21 +465,12 @@ def test_diff_ops(docker_url, test_schema):
     assert client.patch(
         {"@id": "Person/Jane", "@type": "Person", "name": "Jane"}, result_patch
     ) == {"@id": "Person/Jane", "@type": "Person", "name": "Janine"}
-    assert public_patch.patch(
-        {"@id": "Person/Jane", "@type": "Person", "name": "Jane"}, result_patch
-    ) == {"@id": "Person/Jane", "@type": "Person", "name": "Janine"}
     assert client.patch(jane, result_patch) == {
         "@id": "Person/Jane",
         "@type": "Person",
         "name": "Janine",
         "age": 18,
     }
-    assert public_patch.patch(jane, result_patch) == {
-        "@id": "Person/Jane",
-        "@type": "Person",
-        "name": "Janine",
-        "age": 18,
-    }
     my_schema = test_schema.copy()
     my_schema.object.pop("Employee")
     assert my_schema.to_dict() != test_schema.to_dict()
@@ -545,6 +525,10 @@ def test_diff_ops_no_auth(test_schema, terminusx_token):
     # assert client.patch(test_schema, result) == my_schema.to_dict()
 
 
+@pytest.mark.skipif(
+    os.environ.get("TERMINUSDB_TEST_JWT") is None,
+    reason="JWT testing not enabled. Set TERMINUSDB_TEST_JWT=1 to enable JWT tests."
+)
 def test_jwt(docker_url_jwt):
     # create client
     url = docker_url_jwt[0]