Skip to content

Commit 3dbba45

Browse files
committed
Cleanup and lint
Signed-off-by: Mihai Criveti <[email protected]>
1 parent b1f784a commit 3dbba45

12 files changed

+183
-133
lines changed

tests/unit/mcpgateway/services/test_completion_service.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ class DummySession:
151151
assert "Missing URI template" in str(exc.value)
152152

153153

154-
155154
@pytest.mark.asyncio
156155
async def test_complete_resource_values():
157156
service = CompletionService()

tests/unit/mcpgateway/services/test_gateway_service.py

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ def _inject_check_gateway_health(monkeypatch):
8181

8282
async def _check(self, gateway):
8383
try:
84-
await self._initialize_gateway(
85-
gateway.url, getattr(gateway, "auth_value", {}), getattr(gateway, "transport", "sse")
86-
)
84+
await self._initialize_gateway(gateway.url, getattr(gateway, "auth_value", {}), getattr(gateway, "transport", "sse"))
8785
gateway.last_seen = datetime.now(timezone.utc)
8886
return True
8987
except Exception:
@@ -147,8 +145,8 @@ async def test_register_gateway(self, gateway_service, test_db):
147145
# DB: no gateway with that name; no existing tools found
148146
test_db.execute = Mock(
149147
side_effect=[
150-
_make_execute_result(scalar=None), # name-conflict check
151-
_make_execute_result(scalars_list=[]), # tool lookup
148+
_make_execute_result(scalar=None), # name-conflict check
149+
_make_execute_result(scalars_list=[]), # tool lookup
152150
]
153151
)
154152
test_db.add = Mock()
@@ -188,7 +186,6 @@ async def test_register_gateway(self, gateway_service, test_db):
188186
assert result.url == "http://example.com/gateway"
189187
assert result.description == "A test gateway"
190188

191-
192189
@pytest.mark.asyncio
193190
async def test_register_gateway_name_conflict(self, gateway_service, mock_gateway, test_db):
194191
"""Trying to register a gateway whose *name* already exists raises a conflict error."""
@@ -228,7 +225,6 @@ async def test_register_gateway_connection_error(self, gateway_service, test_db)
228225

229226
assert "Failed to connect" in str(exc_info.value)
230227

231-
232228
# ────────────────────────────────────────────────────────────────────
233229
# LIST / GET
234230
# ────────────────────────────────────────────────────────────────────
@@ -398,9 +394,7 @@ async def test_forward_request(self, gateway_service, mock_gateway):
398394
"""Happy-path RPC forward."""
399395
mock_response = AsyncMock()
400396
mock_response.raise_for_status = Mock()
401-
mock_response.json = Mock(
402-
return_value={"jsonrpc": "2.0", "result": {"success": True, "data": "OK"}, "id": 1}
403-
)
397+
mock_response.json = Mock(return_value={"jsonrpc": "2.0", "result": {"success": True, "data": "OK"}, "id": 1})
404398
gateway_service._http_client.post.return_value = mock_response
405399

406400
result = await gateway_service.forward_request(mock_gateway, "method", {"p": 1})
@@ -413,9 +407,7 @@ async def test_forward_request_error_response(self, gateway_service, mock_gatewa
413407
"""Gateway returns JSON-RPC error."""
414408
mock_response = AsyncMock()
415409
mock_response.raise_for_status = Mock()
416-
mock_response.json = Mock(
417-
return_value={"jsonrpc": "2.0", "error": {"code": -32000, "message": "Boom"}, "id": 1}
418-
)
410+
mock_response.json = Mock(return_value={"jsonrpc": "2.0", "error": {"code": -32000, "message": "Boom"}, "id": 1})
419411
gateway_service._http_client.post.return_value = mock_response
420412

421413
with pytest.raises(GatewayError) as exc_info:

tests/unit/mcpgateway/services/test_logging_service.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
from mcpgateway.services.logging_service import LoggingService
2828
from mcpgateway.types import LogLevel
2929

30-
3130
# ---------------------------------------------------------------------------
3231
# Basic behaviour
3332
# ---------------------------------------------------------------------------

tests/unit/mcpgateway/services/test_prompt_service.py

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
)
3434
from mcpgateway.types import LogLevel, Message, PromptResult, Role, TextContent
3535

36-
3736
# ---------------------------------------------------------------------------
3837
# helpers
3938
# ---------------------------------------------------------------------------
@@ -56,7 +55,6 @@ def _make_execute_result(*, scalar: Any = None, scalars_list: Optional[list] = N
5655
return result
5756

5857

59-
6058
def _build_db_prompt(
6159
*,
6260
pid: int = 1,
@@ -184,10 +182,12 @@ async def test_get_prompt_not_found(self, prompt_service, test_db):
184182
@pytest.mark.asyncio
185183
async def test_update_prompt_success(self, prompt_service, test_db):
186184
existing = _build_db_prompt()
187-
test_db.execute = Mock(side_effect=[ # first call = find existing, second = conflict check
188-
_make_execute_result(scalar=existing),
189-
_make_execute_result(scalar=None),
190-
])
185+
test_db.execute = Mock(
186+
side_effect=[ # first call = find existing, second = conflict check
187+
_make_execute_result(scalar=existing),
188+
_make_execute_result(scalar=None),
189+
]
190+
)
191191
test_db.commit = Mock()
192192
test_db.refresh = Mock()
193193
prompt_service._notify_prompt_updated = AsyncMock()
@@ -204,10 +204,12 @@ async def test_update_prompt_success(self, prompt_service, test_db):
204204
async def test_update_prompt_name_conflict(self, prompt_service, test_db):
205205
existing = _build_db_prompt()
206206
conflicting = _build_db_prompt(pid=2, name="other")
207-
test_db.execute = Mock(side_effect=[
208-
_make_execute_result(scalar=existing),
209-
_make_execute_result(scalar=conflicting),
210-
])
207+
test_db.execute = Mock(
208+
side_effect=[
209+
_make_execute_result(scalar=existing),
210+
_make_execute_result(scalar=conflicting),
211+
]
212+
)
211213
upd = PromptUpdate(name="other")
212214
with pytest.raises(PromptError) as exc_info:
213215
await prompt_service.update_prompt(test_db, "hello", upd)
@@ -259,15 +261,17 @@ async def test_delete_prompt_not_found(self, prompt_service, test_db):
259261
@pytest.mark.asyncio
260262
async def test_aggregate_and_reset_metrics(self, prompt_service, test_db):
261263
# Metrics numbers to be returned by scalar() calls
262-
test_db.execute = Mock(side_effect=[
263-
_make_execute_result(scalar=10), # total
264-
_make_execute_result(scalar=8), # successful
265-
_make_execute_result(scalar=2), # failed
266-
_make_execute_result(scalar=0.1), # min_rt
267-
_make_execute_result(scalar=0.9), # max_rt
268-
_make_execute_result(scalar=0.5), # avg_rt
269-
_make_execute_result(scalar=datetime(2025, 1, 1, tzinfo=timezone.utc)), # last_time
270-
])
264+
test_db.execute = Mock(
265+
side_effect=[
266+
_make_execute_result(scalar=10), # total
267+
_make_execute_result(scalar=8), # successful
268+
_make_execute_result(scalar=2), # failed
269+
_make_execute_result(scalar=0.1), # min_rt
270+
_make_execute_result(scalar=0.9), # max_rt
271+
_make_execute_result(scalar=0.5), # avg_rt
272+
_make_execute_result(scalar=datetime(2025, 1, 1, tzinfo=timezone.utc)), # last_time
273+
]
274+
)
271275

272276
metrics = await prompt_service.aggregate_metrics(test_db)
273277
assert metrics["total_executions"] == 10

tests/unit/mcpgateway/services/test_resource_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
from mcpgateway.schemas import ResourceCreate, ResourceRead
1515
from mcpgateway.services.resource_service import (
16+
ResourceError,
1617
ResourceNotFoundError,
1718
ResourceService,
1819
ResourceURIConflictError,
19-
ResourceError
2020
)
2121

2222

tests/unit/mcpgateway/services/test_root_service.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ async def test_initialize_adds_default_roots(monkeypatch):
103103
await service.shutdown()
104104

105105

106-
107106
@pytest.mark.asyncio
108107
async def test_subscribe_changes_receives_events():
109108
service = RootService()
@@ -112,7 +111,7 @@ async def test_subscribe_changes_receives_events():
112111
async def subscriber():
113112
async for ev in service.subscribe_changes():
114113
events.append(ev)
115-
if len(events) >= 2: # expect "added" then "removed"
114+
if len(events) >= 2: # expect "added" then "removed"
116115
break
117116

118117
# Start subscription and give the event-loop one tick so the queue
@@ -122,7 +121,7 @@ async def subscriber():
122121

123122
# Add a root, then remove it again.
124123
r = await service.add_root("subscriber-test")
125-
await service.remove_root(str(r.uri).rstrip("/")) # match stored key
124+
await service.remove_root(str(r.uri).rstrip("/")) # match stored key
126125

127126
# Collect both events or time-out
128127
await asyncio.wait_for(task, timeout=1.0)

0 commit comments

Comments
 (0)