Skip to content

fix(Test): skip stale images #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: next
Choose a base branch
from
Open

fix(Test): skip stale images #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce46ddc
fix(Test): skip stale images
BotellaA Oct 28, 2025
195880a
Apply prepare changes
BotellaA Oct 28, 2025
c514a19
clean
BotellaA Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,3 @@ wslink==1.12.4
yarl>=1
# via aiohttp

opengeodeweb-microservice==1.*,>=1.0.6rc1
30 changes: 12 additions & 18 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,29 +99,25 @@ def images_diff(self, first_image_path: str, second_image_path: str) -> float:
print(f"{images_diff.GetThresholdedError()=}")
return images_diff.GetThresholdedError()

def compare_image(self, nb_messages: int, filename: str) -> bool:
for message in range(nb_messages):
print(f"{message=}", flush=True)
def compare_image(self, filename: str) -> bool:
while True:
image = self.ws.recv()
if isinstance(image, bytes):
response = self.ws.recv()
print(f"{response=}", flush=True)
result = json.loads(response)["result"]
if result["stale"]:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JulienChampagnol si c'est stale alors c'est qu'on a pas récupéré la dernière image, il y en a une autre en cours de traitement

continue
test_file_path = os.path.abspath(
os.path.join(self.test_output_dir, "test.jpeg")
os.path.join(self.test_output_dir, f"test.{result["format"]}")
)
with open(test_file_path, "wb") as f:
f.write(image)
f.close()
if isinstance(image, bytes):
response = self.ws.recv()
print(f"{response=}", flush=True)
format = json.loads(response)["result"]["format"]
test_file_path = os.path.abspath(
os.path.join(self.test_output_dir, f"test.{format}")
)
with open(test_file_path, "wb") as f:
f.write(image)
f.close()
path_image = os.path.join(self.images_dir_path, filename)
return self.images_diff(test_file_path, path_image) == 0.0
path_image = os.path.join(self.images_dir_path, filename)
return self.images_diff(test_file_path, path_image) == 0.0
else:
print("response =", image, flush=True)
return False

def _init_ws(self) -> None:
Expand All @@ -141,10 +137,8 @@ def _drain_initial_messages(
) -> None:
self.ws.settimeout(timeout)
for i in range(max_messages):
print(f"{i=}", flush=True)
try:
response = self.ws.recv()
print(f"{response=}", flush=True)
except WebSocketTimeoutException:
print(
f"Timeout on message {i}, but continuing to try remaining messages...",
Expand Down
10 changes: 5 additions & 5 deletions tests/mesh/edges/test_mesh_edges_protocols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def test_edges_visibility(
+ VtkMeshEdgesView.mesh_edges_schemas_dict["visibility"]["rpc"],
[{"id": "123456789", "visibility": True}],
)
assert server.compare_image(3, "mesh/edges/visibility.jpeg") == True
assert server.compare_image("mesh/edges/visibility.jpeg") == True


def test_edges_color(
Expand All @@ -33,7 +33,7 @@ def test_edges_color(
+ VtkMeshEdgesView.mesh_edges_schemas_dict["color"]["rpc"],
[{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}],
)
assert server.compare_image(3, "mesh/edges/color.jpeg") == True
assert server.compare_image("mesh/edges/color.jpeg") == True


def test_edges_with_edged_curve(
Expand All @@ -45,18 +45,18 @@ def test_edges_with_edged_curve(
VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
[{"id": "123456789"}],
)
assert server.compare_image(3, "mesh/edges/register_edged_curve.jpeg") == True
assert server.compare_image("mesh/edges/register_edged_curve.jpeg") == True

server.call(
VtkMeshEdgesView.mesh_edges_prefix
+ VtkMeshEdgesView.mesh_edges_schemas_dict["color"]["rpc"],
[{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}],
)
assert server.compare_image(3, "mesh/edges/edged_curve_color.jpeg") == True
assert server.compare_image("mesh/edges/edged_curve_color.jpeg") == True

server.call(
VtkMeshEdgesView.mesh_edges_prefix
+ VtkMeshEdgesView.mesh_edges_schemas_dict["visibility"]["rpc"],
[{"id": "123456789", "visibility": False}],
)
assert server.compare_image(3, "mesh/edges/edged_curve_visibility.jpeg") == True
assert server.compare_image("mesh/edges/edged_curve_visibility.jpeg") == True
14 changes: 7 additions & 7 deletions tests/mesh/points/test_mesh_points_protocols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def test_points_visibility(
+ cast(str, VtkMeshPointsView.mesh_points_schemas_dict["visibility"]["rpc"]),
[{"id": mesh_id, "visibility": True}],
)
assert server.compare_image(3, "mesh/points/visibility.jpeg") == True
assert server.compare_image("mesh/points/visibility.jpeg") == True


def test_points_size(
Expand All @@ -37,7 +37,7 @@ def test_points_size(
+ cast(str, VtkMeshPointsView.mesh_points_schemas_dict["size"]["rpc"]),
[{"id": mesh_id, "size": 15}],
)
assert server.compare_image(3, "mesh/points/size.jpeg") == True
assert server.compare_image("mesh/points/size.jpeg") == True


def test_points_color(
Expand All @@ -51,7 +51,7 @@ def test_points_color(
+ cast(str, VtkMeshPointsView.mesh_points_schemas_dict["color"]["rpc"]),
[{"id": mesh_id, "color": {"r": 255, "g": 0, "b": 0}}],
)
assert server.compare_image(3, "mesh/points/color.jpeg") == True
assert server.compare_image("mesh/points/color.jpeg") == True


def test_points_with_point_set(
Expand All @@ -65,25 +65,25 @@ def test_points_with_point_set(
+ cast(str, VtkMeshView.mesh_schemas_dict["register"]["rpc"]),
[{"id": mesh_id}],
)
assert server.compare_image(3, "mesh/points/register_point_set.jpeg") == True
assert server.compare_image("mesh/points/register_point_set.jpeg") == True

server.call(
VtkMeshPointsView.mesh_points_prefix
+ cast(str, VtkMeshPointsView.mesh_points_schemas_dict["size"]["rpc"]),
[{"id": mesh_id, "size": 10}],
)
assert server.compare_image(3, "mesh/points/point_set_size.jpeg") == True
assert server.compare_image("mesh/points/point_set_size.jpeg") == True

server.call(
VtkMeshPointsView.mesh_points_prefix
+ cast(str, VtkMeshPointsView.mesh_points_schemas_dict["color"]["rpc"]),
[{"id": mesh_id, "color": {"r": 255, "g": 0, "b": 0}}],
)
assert server.compare_image(3, "mesh/points/point_set_color.jpeg") == True
assert server.compare_image("mesh/points/point_set_color.jpeg") == True

server.call(
VtkMeshPointsView.mesh_points_prefix
+ cast(str, VtkMeshPointsView.mesh_points_schemas_dict["visibility"]["rpc"]),
[{"id": mesh_id, "visibility": False}],
)
assert server.compare_image(3, "mesh/points/point_set_visibility.jpeg") == True
assert server.compare_image("mesh/points/point_set_visibility.jpeg") == True
4 changes: 2 additions & 2 deletions tests/mesh/polygons/test_mesh_polygons_protocols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def test_polygons_color(
+ VtkMeshPolygonsView.mesh_polygons_schemas_dict["color"]["rpc"],
[{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}],
)
assert server.compare_image(3, "mesh/polygons/color.jpeg") == True
assert server.compare_image("mesh/polygons/color.jpeg") == True


def test_polygons_visibility(
Expand All @@ -34,4 +34,4 @@ def test_polygons_visibility(
+ VtkMeshPolygonsView.mesh_polygons_schemas_dict["visibility"]["rpc"],
[{"id": "123456789", "visibility": False}],
)
assert server.compare_image(3, "mesh/polygons/visibility.jpeg") == True
assert server.compare_image("mesh/polygons/visibility.jpeg") == True
10 changes: 5 additions & 5 deletions tests/mesh/polyhedra/test_mesh_polyhedra_protocols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def test_register_mesh(
VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
[{"id": "123456789"}],
)
assert server.compare_image(3, "mesh/polyhedra/register.jpeg") == True
assert server.compare_image("mesh/polyhedra/register.jpeg") == True


def test_polyhedra_color(
Expand All @@ -33,7 +33,7 @@ def test_polyhedra_color(
+ VtkMeshPolyhedraView.mesh_polyhedra_schemas_dict["color"]["rpc"],
[{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}],
)
assert server.compare_image(3, "mesh/polyhedra/color.jpeg") == True
assert server.compare_image("mesh/polyhedra/color.jpeg") == True


def test_polyhedra_visibility(
Expand All @@ -46,7 +46,7 @@ def test_polyhedra_visibility(
+ VtkMeshPolyhedraView.mesh_polyhedra_schemas_dict["visibility"]["rpc"],
[{"id": "123456789", "visibility": False}],
)
assert server.compare_image(3, "mesh/polyhedra/visibility.jpeg") == True
assert server.compare_image("mesh/polyhedra/visibility.jpeg") == True


def test_vertex_attribute(
Expand All @@ -59,7 +59,7 @@ def test_vertex_attribute(
+ VtkMeshPolyhedraView.mesh_polyhedra_schemas_dict["vertex_attribute"]["rpc"],
[{"id": "123456789", "name": "toto_on_vertices"}],
)
assert server.compare_image(3, "mesh/polyhedra/vertex_attribute.jpeg") == True
assert server.compare_image("mesh/polyhedra/vertex_attribute.jpeg") == True


def test_polyhedron_attribute(
Expand All @@ -74,4 +74,4 @@ def test_polyhedron_attribute(
],
[{"id": "123456789", "name": "toto_on_polyhedra"}],
)
assert server.compare_image(3, "mesh/polyhedra/polyhedron_attribute.jpeg") == True
assert server.compare_image("mesh/polyhedra/polyhedron_attribute.jpeg") == True
22 changes: 11 additions & 11 deletions tests/mesh/test_mesh_protocols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def test_register_mesh(
VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
[{"id": "123456789"}],
)
assert server.compare_image(3, "mesh/register.jpeg") == True
assert server.compare_image("mesh/register.jpeg") == True


def test_deregister_mesh(
Expand All @@ -25,7 +25,7 @@ def test_deregister_mesh(
[{"id": "123456789"}],
)

assert server.compare_image(3, "mesh/deregister.jpeg") == True
assert server.compare_image("mesh/deregister.jpeg") == True


def test_opacity(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
Expand All @@ -35,7 +35,7 @@ def test_opacity(server: ServerMonitor, dataset_factory: Callable[..., str]) ->
VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["opacity"]["rpc"],
[{"id": "123456789", "opacity": 0.1}],
)
assert server.compare_image(3, "mesh/opacity.jpeg") == True
assert server.compare_image("mesh/opacity.jpeg") == True


def test_visibility(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
Expand All @@ -45,7 +45,7 @@ def test_visibility(server: ServerMonitor, dataset_factory: Callable[..., str])
VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["visibility"]["rpc"],
[{"id": "123456789", "visibility": False}],
)
assert server.compare_image(3, "mesh/visibility.jpeg") == True
assert server.compare_image("mesh/visibility.jpeg") == True


def test_color(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
Expand All @@ -55,7 +55,7 @@ def test_color(server: ServerMonitor, dataset_factory: Callable[..., str]) -> No
VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["color"]["rpc"],
[{"id": "123456789", "color": {"r": 50, "g": 2, "b": 250}}],
)
assert server.compare_image(3, "mesh/color.jpeg") == True
assert server.compare_image("mesh/color.jpeg") == True


def test_apply_textures(
Expand All @@ -81,32 +81,32 @@ def test_apply_textures(
}
],
)
assert server.compare_image(3, "mesh/apply_textures.jpeg") == True
assert server.compare_image("mesh/apply_textures.jpeg") == True


# def test_display_vertex_attribute(server):
# server.call(VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"], [{"id": "123456789", "file_name": "vertex_attribute.vtp"}])
# assert server.compare_image(3, "mesh/display_vertex_attribute_1.jpeg") == True
# assert server.compare_image("mesh/display_vertex_attribute_1.jpeg") == True

# server.call(
# VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["display_vertex_attribute"]["rpc"],
# [{"id": "123456789", "name": "geode_implicit_attribute"}],
# )
# assert server.compare_image(3, "mesh/display_vertex_attribute_2.jpeg") == True
# assert server.compare_image("mesh/display_vertex_attribute_2.jpeg") == True


# server.call(
# VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["color"]["rpc"],
# [{"id": "123456789", "red": 250, "green": 0, "blue": 0}],
# )
# assert server.compare_image(3, "mesh/display_vertex_attribute_3.jpeg") == True
# assert server.compare_image("mesh/display_vertex_attribute_3.jpeg") == True

# def test_display_polygon_attribute(server):
# server.call(VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"], [{"id": "123456789", "file_name": "polygon_attribute.vtp"}])
# assert server.compare_image(3, "mesh/display_polygon_attribute_1.jpeg") == True
# assert server.compare_image("mesh/display_polygon_attribute_1.jpeg") == True

# server.call(
# VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["display_polygon_attribute"]["rpc"],
# [{"id": "123456789", "name": "implicit_on_polygons"}],
# )
# assert server.compare_image(3, "mesh/display_polygon_attribute_2.jpeg") == True
# assert server.compare_image("mesh/display_polygon_attribute_2.jpeg") == True
6 changes: 3 additions & 3 deletions tests/model/blocks/test_model_blocks_protocols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def test_blocks_polyhedra_visibility(
],
)

assert server.compare_image(3, "model/cube_visibility_false.jpeg") == True
assert server.compare_image("model/cube_visibility_false.jpeg") == True

server.call(
VtkModelBlocksView.model_blocks_prefix
Expand All @@ -43,7 +43,7 @@ def test_blocks_polyhedra_visibility(
],
)

assert server.compare_image(3, "model/blocks/visibility.jpeg") == True
assert server.compare_image("model/blocks/visibility.jpeg") == True


def test_blocks_polyhedra_color(
Expand All @@ -63,4 +63,4 @@ def test_blocks_polyhedra_color(
}
],
)
assert server.compare_image(3, "model/blocks/color.jpeg") == True
assert server.compare_image("model/blocks/color.jpeg") == True
6 changes: 3 additions & 3 deletions tests/model/corners/test_model_corners_protocols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def test_corners_points_visibility(
}
],
)
assert server.compare_image(3, "model/cube_visibility_false.jpeg") == True
assert server.compare_image("model/cube_visibility_false.jpeg") == True

server.call(
VtkModelCornersView.model_corners_prefix
Expand All @@ -41,7 +41,7 @@ def test_corners_points_visibility(
}
],
)
assert server.compare_image(3, "model/corners/visibility.jpeg") == True
assert server.compare_image("model/corners/visibility.jpeg") == True


def test_corners_points_color(
Expand All @@ -61,4 +61,4 @@ def test_corners_points_color(
}
],
)
assert server.compare_image(3, "model/corners/color.jpeg") == True
assert server.compare_image("model/corners/color.jpeg") == True
2 changes: 1 addition & 1 deletion tests/model/edges/test_model_edges_protocols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ def test_edges_visibility(
+ VtkModelEdgesView.model_edges_schemas_dict["visibility"]["rpc"],
[{"id": "123456789", "visibility": True}],
)
assert server.compare_image(3, "model/edges/visibility.jpeg") == True
assert server.compare_image("model/edges/visibility.jpeg") == True
6 changes: 3 additions & 3 deletions tests/model/lines/test_model_lines_protocols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def test_lines_edges_visibility(
}
],
)
assert server.compare_image(3, "model/cube_visibility_false.jpeg") == True
assert server.compare_image("model/cube_visibility_false.jpeg") == True

server.call(
VtkModelLinesView.model_lines_prefix
Expand All @@ -41,7 +41,7 @@ def test_lines_edges_visibility(
}
],
)
assert server.compare_image(3, "model/lines/visibility.jpeg") == True
assert server.compare_image("model/lines/visibility.jpeg") == True


def test_lines_edges_color(
Expand All @@ -61,4 +61,4 @@ def test_lines_edges_color(
}
],
)
assert server.compare_image(3, "model/lines/color.jpeg") == True
assert server.compare_image("model/lines/color.jpeg") == True
4 changes: 2 additions & 2 deletions tests/model/points/test_model_points_protocols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def test_points_visibility(
+ VtkModelPointsView.model_points_schemas_dict["visibility"]["rpc"],
[{"id": "123456789", "visibility": True}],
)
assert server.compare_image(3, "model/points/visibility.jpeg") == True
assert server.compare_image("model/points/visibility.jpeg") == True


def test_points_size(
Expand All @@ -36,4 +36,4 @@ def test_points_size(
+ VtkModelPointsView.model_points_schemas_dict["size"]["rpc"],
[{"id": "123456789", "size": 20}],
)
assert server.compare_image(3, "model/points/size.jpeg") == True
assert server.compare_image("model/points/size.jpeg") == True
Loading