diff --git a/tests/conftest.py b/tests/conftest.py index 6834150fcbd..07d08c204ac 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -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" ) diff --git a/tests/test_resultinfo.py b/tests/test_resultinfo.py index a064e1e324b..c6defa0b1a7 100644 --- a/tests/test_resultinfo.py +++ b/tests/test_resultinfo.py @@ -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: @@ -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 @@ -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