Skip to content

Commit d2d817d

Browse files
committed
Make the server check work correctly
1 parent ae2d3e6 commit d2d817d

2 files changed

Lines changed: 27 additions & 34 deletions

File tree

terminusdb_client/tests/integration_tests/conftest.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,29 @@
1212
def is_local_server_running():
1313
"""Check if local TerminusDB server is running at http://127.0.0.1:6363"""
1414
try:
15-
response = requests.get("http://127.0.0.1:6363", timeout=2)
16-
# Server responds with 200 (success) or 404 (not found but server is up)
17-
# 401 (unauthorized) also indicates server is running but needs auth
18-
return response.status_code in [200, 404]
15+
requests.get("http://127.0.0.1:6363", timeout=2)
16+
# Any HTTP response means the server is running
17+
return True
1918
except (requests.exceptions.ConnectionError, requests.exceptions.Timeout):
2019
return False
2120

2221

2322
def is_docker_server_running():
2423
"""Check if Docker TerminusDB server is already running at http://127.0.0.1:6366"""
2524
try:
26-
response = requests.get("http://127.0.0.1:6366", timeout=2)
27-
# Server responds with 404 for root path, which means it's running
28-
return response.status_code in [200, 404]
25+
requests.get("http://127.0.0.1:6366", timeout=2)
26+
# Any HTTP response means the server is running
27+
return True
2928
except (requests.exceptions.ConnectionError, requests.exceptions.Timeout):
3029
return False
3130

3231

3332
def is_jwt_server_running():
3433
"""Check if JWT Docker TerminusDB server is already running at http://127.0.0.1:6367"""
3534
try:
36-
response = requests.get("http://127.0.0.1:6367", timeout=2)
37-
# Server responds with 404 for root path, which means it's running
38-
return response.status_code in [200, 404]
35+
requests.get("http://127.0.0.1:6367", timeout=2)
36+
# Any HTTP response means the server is running
37+
return True
3938
except (requests.exceptions.ConnectionError, requests.exceptions.Timeout):
4039
return False
4140

terminusdb_client/tests/integration_tests/test_conftest.py

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,18 @@ class TestServerDetection:
1414
"""Test server detection helper functions"""
1515

1616
@patch("terminusdb_client.tests.integration_tests.conftest.requests.get")
17-
def test_local_server_running_200(self, mock_get):
18-
"""Test local server detection returns True for HTTP 200"""
19-
mock_response = Mock()
20-
mock_response.status_code = 200
21-
mock_get.return_value = mock_response
17+
def test_local_server_running_any_response(self, mock_get):
18+
"""Test local server detection returns True for any HTTP response"""
19+
mock_get.return_value = Mock()
2220

2321
assert is_local_server_running() is True
2422
mock_get.assert_called_once_with("http://127.0.0.1:6363", timeout=2)
2523

2624
@patch("terminusdb_client.tests.integration_tests.conftest.requests.get")
27-
def test_local_server_running_404(self, mock_get):
28-
"""Test local server detection returns True for HTTP 404"""
25+
def test_local_server_running_401(self, mock_get):
26+
"""Test local server detection returns True for HTTP 401 (unauthorized)"""
2927
mock_response = Mock()
30-
mock_response.status_code = 404
28+
mock_response.status_code = 401
3129
mock_get.return_value = mock_response
3230

3331
assert is_local_server_running() is True
@@ -47,20 +45,18 @@ def test_local_server_not_running_timeout(self, mock_get):
4745
assert is_local_server_running() is False
4846

4947
@patch("terminusdb_client.tests.integration_tests.conftest.requests.get")
50-
def test_docker_server_running_200(self, mock_get):
51-
"""Test Docker server detection returns True for HTTP 200"""
52-
mock_response = Mock()
53-
mock_response.status_code = 200
54-
mock_get.return_value = mock_response
48+
def test_docker_server_running_any_response(self, mock_get):
49+
"""Test Docker server detection returns True for any HTTP response"""
50+
mock_get.return_value = Mock()
5551

5652
assert is_docker_server_running() is True
5753
mock_get.assert_called_once_with("http://127.0.0.1:6366", timeout=2)
5854

5955
@patch("terminusdb_client.tests.integration_tests.conftest.requests.get")
60-
def test_docker_server_running_404(self, mock_get):
61-
"""Test Docker server detection returns True for HTTP 404"""
56+
def test_docker_server_running_401(self, mock_get):
57+
"""Test Docker server detection returns True for HTTP 401 (unauthorized)"""
6258
mock_response = Mock()
63-
mock_response.status_code = 404
59+
mock_response.status_code = 401
6460
mock_get.return_value = mock_response
6561

6662
assert is_docker_server_running() is True
@@ -73,20 +69,18 @@ def test_docker_server_not_running(self, mock_get):
7369
assert is_docker_server_running() is False
7470

7571
@patch("terminusdb_client.tests.integration_tests.conftest.requests.get")
76-
def test_jwt_server_running_200(self, mock_get):
77-
"""Test JWT server detection returns True for HTTP 200"""
78-
mock_response = Mock()
79-
mock_response.status_code = 200
80-
mock_get.return_value = mock_response
72+
def test_jwt_server_running_any_response(self, mock_get):
73+
"""Test JWT server detection returns True for any HTTP response"""
74+
mock_get.return_value = Mock()
8175

8276
assert is_jwt_server_running() is True
8377
mock_get.assert_called_once_with("http://127.0.0.1:6367", timeout=2)
8478

8579
@patch("terminusdb_client.tests.integration_tests.conftest.requests.get")
86-
def test_jwt_server_running_404(self, mock_get):
87-
"""Test JWT server detection returns True for HTTP 404"""
80+
def test_jwt_server_running_401(self, mock_get):
81+
"""Test JWT server detection returns True for HTTP 401 (unauthorized)"""
8882
mock_response = Mock()
89-
mock_response.status_code = 404
83+
mock_response.status_code = 401
9084
mock_get.return_value = mock_response
9185

9286
assert is_jwt_server_running() is True

0 commit comments

Comments
 (0)