Skip to content

Make test_resultinfo.py retrocompatible with DPF 7.0 #1199

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

Merged
merged 1 commit into from
Oct 12, 2023
Merged

Make test_resultinfo.py retrocompatible with DPF 7.0 #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@ def return_ds(server=None):
return return_ds


SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_1 = meets_version(
get_server_version(core._global_server()), "7.1"
)
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0 = meets_version(
get_server_version(core._global_server()), "7.0"
)
Expand Down
5 changes: 3 additions & 2 deletions tests/test_resultinfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from conftest import (
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_5_0,
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0,
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_1,
)

if SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_5_0:
Expand All @@ -25,7 +26,7 @@ def test_get_resultinfo_no_model(velocity_acceleration, server_type):
op.connect(4, dataSource)
res = op.get_output(0, dpf.core.types.result_info)
assert res.analysis_type == "static"
if not SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0:
if not SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_1:
assert res.n_results == 14
else:
assert res.n_results == 15
Expand All @@ -36,7 +37,7 @@ def test_get_resultinfo_no_model(velocity_acceleration, server_type):
def test_get_resultinfo(model):
res = model.metadata.result_info
assert res.analysis_type == "static"
if not SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0:
if not SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_1:
assert res.n_results == 14
else:
assert res.n_results == 15
Expand Down