Skip to content

Commit 6052034

Browse files
fix(test): revert some failing changes
1 parent 71f35ae commit 6052034

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

tests/test_operator.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0,
4646
SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_8_0,
4747
)
48-
from conftest import raises_for_servers_version_under
4948

5049
# Check for ANSYS installation env var
5150
HAS_AWP_ROOT212 = os.environ.get("AWP_ROOT212", False) is not False
@@ -1428,7 +1427,10 @@ def test_operator_input_output_streams(server_in_process, simple_bar):
14281427
assert times
14291428

14301429

1431-
@raises_for_servers_version_under("10.0")
1430+
@pytest.mark.skipif(
1431+
not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_10_0,
1432+
reason="Operator `workflow_to_workflow_topology` does not exist below 10.0",
1433+
)
14321434
def test_operator_outputs_derived_class(server_type):
14331435
workflow = dpf.core.Workflow(server=server_type)
14341436

@@ -1441,7 +1443,10 @@ def test_operator_outputs_derived_class(server_type):
14411443
assert workflow_topology
14421444

14431445

1444-
@raises_for_servers_version_under("10.0")
1446+
@pytest.mark.skipif(
1447+
not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_10_0,
1448+
reason="Operator `workflow_to_workflow_topology` does not exist below 10.0",
1449+
)
14451450
def test_operator_get_output_derived_class(server_type):
14461451
workflow = dpf.core.Workflow(server=server_type)
14471452

tests/test_workflow_topology.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
from ansys import dpf
2626
import ansys.dpf.core.operators as op
27+
import conftest
2728
from conftest import raises_for_servers_version_under
2829

2930

@@ -156,7 +157,10 @@ def expected_workflow_topology(workflow):
156157
return workflow_topologies[workflow.name]
157158

158159

159-
@raises_for_servers_version_under("10.0")
160+
@pytest.mark.skipif(
161+
not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_10_0,
162+
reason="Operator `workflow_to_workflow_topology` does not exist below 10.0",
163+
)
160164
def test_instantiate_workflow_to_workflow_topology_op(server_type):
161165
workflow_to_workflow_topology_op = dpf.core.Operator(
162166
"workflow_to_workflow_topology", server=server_type

0 commit comments

Comments
 (0)