mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-10-28 11:12:26 +02:00
fix: report empty projects as not locked
GET /projects/{id}/locked returned True for a project with no drawings
or nodes: both loops ran zero times and the fallback return won. Locking
and unlocking such a project always succeeded while the state stayed
"locked", so it could never be unlocked.
Report a project with nothing to lock as not locked, and re-check the
state after unlock in the route tests.
This commit is contained in:
parent
f31bfffefc
commit
97e7a79117
@ -2141,6 +2141,10 @@ class Project:
|
|||||||
Check if all items in a project are locked and not
|
Check if all items in a project are locked and not
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
if not self._drawings and not self._nodes:
|
||||||
|
# a project without drawings or nodes has nothing to lock and would
|
||||||
|
# otherwise always report as locked, even after unlocking it
|
||||||
|
return False
|
||||||
for drawing in self._drawings.values():
|
for drawing in self._drawings.values():
|
||||||
if not drawing.locked:
|
if not drawing.locked:
|
||||||
return False
|
return False
|
||||||
|
|||||||
@ -613,3 +613,29 @@ class TestControllerProjectRoutes:
|
|||||||
assert drawing.locked is False
|
assert drawing.locked is False
|
||||||
for node in project.nodes.values():
|
for node in project.nodes.values():
|
||||||
assert node.locked is False
|
assert node.locked is False
|
||||||
|
|
||||||
|
response = await client.get(app.url_path_for("locked_project", project_id=project.id))
|
||||||
|
assert response.status_code == status.HTTP_200_OK
|
||||||
|
assert response.json() is False
|
||||||
|
|
||||||
|
async def test_lock_unlock_empty_project(self, app: FastAPI, client: AsyncClient, project: Project) -> None:
|
||||||
|
|
||||||
|
# a project without drawings or nodes has nothing to lock and must
|
||||||
|
# never report as locked, otherwise it could not be unlocked
|
||||||
|
response = await client.get(app.url_path_for("locked_project", project_id=project.id))
|
||||||
|
assert response.status_code == status.HTTP_200_OK
|
||||||
|
assert response.json() is False
|
||||||
|
|
||||||
|
response = await client.post(app.url_path_for("lock_project", project_id=project.id))
|
||||||
|
assert response.status_code == status.HTTP_204_NO_CONTENT
|
||||||
|
|
||||||
|
response = await client.get(app.url_path_for("locked_project", project_id=project.id))
|
||||||
|
assert response.status_code == status.HTTP_200_OK
|
||||||
|
assert response.json() is False
|
||||||
|
|
||||||
|
response = await client.post(app.url_path_for("unlock_project", project_id=project.id))
|
||||||
|
assert response.status_code == status.HTTP_204_NO_CONTENT
|
||||||
|
|
||||||
|
response = await client.get(app.url_path_for("locked_project", project_id=project.id))
|
||||||
|
assert response.status_code == status.HTTP_200_OK
|
||||||
|
assert response.json() is False
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user