Skip to content

Commit 7ad9470

Browse files
authored
Make test_resultinfo.py retrocompatible with DPF 7.0 (#1199)
1 parent b21be1b commit 7ad9470

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

tests/conftest.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,9 @@ def return_ds(server=None):
290290
return return_ds
291291

292292

293+
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_1 = meets_version(
294+
get_server_version(core._global_server()), "7.1"
295+
)
293296
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0 = meets_version(
294297
get_server_version(core._global_server()), "7.0"
295298
)

tests/test_resultinfo.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from conftest import (
66
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_5_0,
77
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0,
8+
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_1,
89
)
910

1011
if SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_5_0:
@@ -25,7 +26,7 @@ def test_get_resultinfo_no_model(velocity_acceleration, server_type):
2526
op.connect(4, dataSource)
2627
res = op.get_output(0, dpf.core.types.result_info)
2728
assert res.analysis_type == "static"
28-
if not SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0:
29+
if not SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_1:
2930
assert res.n_results == 14
3031
else:
3132
assert res.n_results == 15
@@ -36,7 +37,7 @@ def test_get_resultinfo_no_model(velocity_acceleration, server_type):
3637
def test_get_resultinfo(model):
3738
res = model.metadata.result_info
3839
assert res.analysis_type == "static"
39-
if not SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0:
40+
if not SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_1:
4041
assert res.n_results == 14
4142
else:
4243
assert res.n_results == 15

0 commit comments

Comments
 (0)