Skip to content

Commit 1ac4f86

Browse files
BotellaABotellaA
authored
Merge pull request #106 from Geode-solutions/fix/test-stale
fix(Test): skip stale images
2 parents 8c4c41f + c514a19 commit 1ac4f86

16 files changed

+83
-90
lines changed

‎requirements.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,3 @@ wslink==1.12.4
6161
yarl>=1
6262
# via aiohttp
6363

64-
opengeodeweb-microservice==1.*,>=1.0.6rc1

‎tests/conftest.py‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -99,29 +99,25 @@ def images_diff(self, first_image_path: str, second_image_path: str) -> float:
9999
print(f"{images_diff.GetThresholdedError()=}")
100100
return images_diff.GetThresholdedError()
101101

102-
def compare_image(self, nb_messages: int, filename: str) -> bool:
103-
for message in range(nb_messages):
104-
print(f"{message=}", flush=True)
102+
def compare_image(self, filename: str) -> bool:
103+
while True:
105104
image = self.ws.recv()
106105
if isinstance(image, bytes):
106+
response = self.ws.recv()
107+
print(f"{response=}", flush=True)
108+
result = json.loads(response)["result"]
109+
if result["stale"]:
110+
continue
107111
test_file_path = os.path.abspath(
108-
os.path.join(self.test_output_dir, "test.jpeg")
112+
os.path.join(self.test_output_dir, f"test.{result["format"]}")
109113
)
110114
with open(test_file_path, "wb") as f:
111115
f.write(image)
112116
f.close()
113-
if isinstance(image, bytes):
114-
response = self.ws.recv()
115-
print(f"{response=}", flush=True)
116-
format = json.loads(response)["result"]["format"]
117-
test_file_path = os.path.abspath(
118-
os.path.join(self.test_output_dir, f"test.{format}")
119-
)
120-
with open(test_file_path, "wb") as f:
121-
f.write(image)
122-
f.close()
123-
path_image = os.path.join(self.images_dir_path, filename)
124-
return self.images_diff(test_file_path, path_image) == 0.0
117+
path_image = os.path.join(self.images_dir_path, filename)
118+
return self.images_diff(test_file_path, path_image) == 0.0
119+
else:
120+
print("response =", image, flush=True)
125121
return False
126122

127123
def _init_ws(self) -> None:
@@ -141,10 +137,8 @@ def _drain_initial_messages(
141137
) -> None:
142138
self.ws.settimeout(timeout)
143139
for i in range(max_messages):
144-
print(f"{i=}", flush=True)
145140
try:
146141
response = self.ws.recv()
147-
print(f"{response=}", flush=True)
148142
except WebSocketTimeoutException:
149143
print(
150144
f"Timeout on message {i}, but continuing to try remaining messages...",

‎tests/mesh/edges/test_mesh_edges_protocols.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_edges_visibility(
2020
+ VtkMeshEdgesView.mesh_edges_schemas_dict["visibility"]["rpc"],
2121
[{"id": "123456789", "visibility": True}],
2222
)
23-
assert server.compare_image(3, "mesh/edges/visibility.jpeg") == True
23+
assert server.compare_image("mesh/edges/visibility.jpeg") == True
2424

2525

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

3838

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

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

5757
server.call(
5858
VtkMeshEdgesView.mesh_edges_prefix
5959
+ VtkMeshEdgesView.mesh_edges_schemas_dict["visibility"]["rpc"],
6060
[{"id": "123456789", "visibility": False}],
6161
)
62-
assert server.compare_image(3, "mesh/edges/edged_curve_visibility.jpeg") == True
62+
assert server.compare_image("mesh/edges/edged_curve_visibility.jpeg") == True

‎tests/mesh/points/test_mesh_points_protocols.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def test_points_visibility(
2323
+ cast(str, VtkMeshPointsView.mesh_points_schemas_dict["visibility"]["rpc"]),
2424
[{"id": mesh_id, "visibility": True}],
2525
)
26-
assert server.compare_image(3, "mesh/points/visibility.jpeg") == True
26+
assert server.compare_image("mesh/points/visibility.jpeg") == True
2727

2828

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

4242

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

5656

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

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

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

8484
server.call(
8585
VtkMeshPointsView.mesh_points_prefix
8686
+ cast(str, VtkMeshPointsView.mesh_points_schemas_dict["visibility"]["rpc"]),
8787
[{"id": mesh_id, "visibility": False}],
8888
)
89-
assert server.compare_image(3, "mesh/points/point_set_visibility.jpeg") == True
89+
assert server.compare_image("mesh/points/point_set_visibility.jpeg") == True

‎tests/mesh/polygons/test_mesh_polygons_protocols.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_polygons_color(
2020
+ VtkMeshPolygonsView.mesh_polygons_schemas_dict["color"]["rpc"],
2121
[{"id": "123456789", "color": {"r": 255, "g": 0, "b": 0}}],
2222
)
23-
assert server.compare_image(3, "mesh/polygons/color.jpeg") == True
23+
assert server.compare_image("mesh/polygons/color.jpeg") == True
2424

2525

2626
def test_polygons_visibility(
@@ -34,4 +34,4 @@ def test_polygons_visibility(
3434
+ VtkMeshPolygonsView.mesh_polygons_schemas_dict["visibility"]["rpc"],
3535
[{"id": "123456789", "visibility": False}],
3636
)
37-
assert server.compare_image(3, "mesh/polygons/visibility.jpeg") == True
37+
assert server.compare_image("mesh/polygons/visibility.jpeg") == True

‎tests/mesh/polyhedra/test_mesh_polyhedra_protocols.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_register_mesh(
2020
VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
2121
[{"id": "123456789"}],
2222
)
23-
assert server.compare_image(3, "mesh/polyhedra/register.jpeg") == True
23+
assert server.compare_image("mesh/polyhedra/register.jpeg") == True
2424

2525

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

3838

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

5151

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

6464

6565
def test_polyhedron_attribute(
@@ -74,4 +74,4 @@ def test_polyhedron_attribute(
7474
],
7575
[{"id": "123456789", "name": "toto_on_polyhedra"}],
7676
)
77-
assert server.compare_image(3, "mesh/polyhedra/polyhedron_attribute.jpeg") == True
77+
assert server.compare_image("mesh/polyhedra/polyhedron_attribute.jpeg") == True

‎tests/mesh/test_mesh_protocols.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def test_register_mesh(
1212
VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
1313
[{"id": "123456789"}],
1414
)
15-
assert server.compare_image(3, "mesh/register.jpeg") == True
15+
assert server.compare_image("mesh/register.jpeg") == True
1616

1717

1818
def test_deregister_mesh(
@@ -25,7 +25,7 @@ def test_deregister_mesh(
2525
[{"id": "123456789"}],
2626
)
2727

28-
assert server.compare_image(3, "mesh/deregister.jpeg") == True
28+
assert server.compare_image("mesh/deregister.jpeg") == True
2929

3030

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

4040

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

5050

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

6060

6161
def test_apply_textures(
@@ -81,32 +81,32 @@ def test_apply_textures(
8181
}
8282
],
8383
)
84-
assert server.compare_image(3, "mesh/apply_textures.jpeg") == True
84+
assert server.compare_image("mesh/apply_textures.jpeg") == True
8585

8686

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

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

9797

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

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

108108
# server.call(
109109
# VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["display_polygon_attribute"]["rpc"],
110110
# [{"id": "123456789", "name": "implicit_on_polygons"}],
111111
# )
112-
# assert server.compare_image(3, "mesh/display_polygon_attribute_2.jpeg") == True
112+
# assert server.compare_image("mesh/display_polygon_attribute_2.jpeg") == True

‎tests/model/blocks/test_model_blocks_protocols.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def test_blocks_polyhedra_visibility(
2929
],
3030
)
3131

32-
assert server.compare_image(3, "model/cube_visibility_false.jpeg") == True
32+
assert server.compare_image("model/cube_visibility_false.jpeg") == True
3333

3434
server.call(
3535
VtkModelBlocksView.model_blocks_prefix
@@ -43,7 +43,7 @@ def test_blocks_polyhedra_visibility(
4343
],
4444
)
4545

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

4848

4949
def test_blocks_polyhedra_color(
@@ -63,4 +63,4 @@ def test_blocks_polyhedra_color(
6363
}
6464
],
6565
)
66-
assert server.compare_image(3, "model/blocks/color.jpeg") == True
66+
assert server.compare_image("model/blocks/color.jpeg") == True

‎tests/model/corners/test_model_corners_protocols.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def test_corners_points_visibility(
2828
}
2929
],
3030
)
31-
assert server.compare_image(3, "model/cube_visibility_false.jpeg") == True
31+
assert server.compare_image("model/cube_visibility_false.jpeg") == True
3232

3333
server.call(
3434
VtkModelCornersView.model_corners_prefix
@@ -41,7 +41,7 @@ def test_corners_points_visibility(
4141
}
4242
],
4343
)
44-
assert server.compare_image(3, "model/corners/visibility.jpeg") == True
44+
assert server.compare_image("model/corners/visibility.jpeg") == True
4545

4646

4747
def test_corners_points_color(
@@ -61,4 +61,4 @@ def test_corners_points_color(
6161
}
6262
],
6363
)
64-
assert server.compare_image(3, "model/corners/color.jpeg") == True
64+
assert server.compare_image("model/corners/color.jpeg") == True

‎tests/model/edges/test_model_edges_protocols.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ def test_edges_visibility(
2222
+ VtkModelEdgesView.model_edges_schemas_dict["visibility"]["rpc"],
2323
[{"id": "123456789", "visibility": True}],
2424
)
25-
assert server.compare_image(3, "model/edges/visibility.jpeg") == True
25+
assert server.compare_image("model/edges/visibility.jpeg") == True

0 commit comments

Comments
 (0)