ci: skip Linux tests with common approach (#1113)

Co-authored-by: pyansys-ci-bot <[email protected]>

Author: RobPasMue

doc/changelog.d/1113.changed.md

@@ -0,0 +1 @@
+ci: skip Linux tests with common approach

tests/integration/conftest.py

@@ -146,9 +146,3 @@ def clean_plot_result_images():
     files = os.listdir(results_dir)
     for file in files:
         os.remove(Path(results_dir, file))
-
-
-@pytest.fixture(scope="session")
-def skip_not_on_linux_service(modeler: Modeler):
-    if modeler.client.backend_type == BackendType.LINUX_SERVICE:
-        return pytest.skip("Implementation not available on Linux service.")  # skip!

tests/integration/test_design.py

@@ -971,8 +971,14 @@ def test_slot_extrusion(modeler: Modeler):
     assert len(body.edges) == 12
 
 
-def test_project_and_imprint_curves(modeler: Modeler, skip_not_on_linux_service):
+def test_project_and_imprint_curves(modeler: Modeler):
     """Test the projection of a set of curves on a body."""
+
+    # Skip on Linux
+    skip_if_linux(
+        modeler, test_project_and_imprint_curves.__name__, "project_curves, imprint_curves"
+    )
+
     # Create your design on the server side
     design = modeler.create_design("ExtrudeSlot")
     comp = design.add_component("Comp1")
@@ -1050,9 +1056,12 @@ def test_project_and_imprint_curves(modeler: Modeler, skip_not_on_linux_service)
     assert len(body_copy.faces) == 8
 
 
-def test_copy_body(modeler: Modeler, skip_not_on_linux_service):
+def test_copy_body(modeler: Modeler):
     """Test copying a body."""
 
+    # Skip on Linux
+    skip_if_linux(modeler, test_copy_body.__name__, "copy")
+
     # Create your design on the server side
     design = modeler.create_design("Design")
 
@@ -1094,8 +1103,12 @@ def test_copy_body(modeler: Modeler, skip_not_on_linux_service):
     assert copy.is_alive
 
 
-def test_beams(modeler: Modeler, skip_not_on_linux_service):
+def test_beams(modeler: Modeler):
     """Test beam creation."""
+
+    # Skip on Linux
+    skip_if_linux(modeler, test_beams.__name__, "create_beam")
+
     # Create your design on the server side
     design = modeler.create_design("BeamCreation")
 
@@ -1388,9 +1401,12 @@ def test_design_points(modeler: Modeler):
     assert isinstance(pd, pv.PolyData)
 
 
-def test_named_selections_beams(modeler: Modeler, skip_not_on_linux_service):
+def test_named_selections_beams(modeler: Modeler):
     """Test for verifying the correct creation of ``NamedSelection`` with beams."""
 
+    # Skip on Linux
+    skip_if_linux(modeler, test_named_selections_beams.__name__, "create_beam")
+
     # Create your design on the server side
     design = modeler.create_design("NamedSelectionBeams_Test")
 
@@ -1502,7 +1518,7 @@ def test_component_instances(modeler: Modeler):
     assert len(car2.components[1].components[1].bodies[0].faces) > 0
 
 
-def test_boolean_body_operations(modeler: Modeler, skip_not_on_linux_service):
+def test_boolean_body_operations(modeler: Modeler):
     """
     Test cases:
 
@@ -1539,6 +1555,12 @@ def test_boolean_body_operations(modeler: Modeler, skip_not_on_linux_service):
                 x) identity
                 y) transform
     """
+    # Skip on Linux
+    skip_if_linux(
+        modeler,
+        test_boolean_body_operations.__name__,
+        "copy, translate, intersect, subtract, unite",
+    )
 
     design = modeler.create_design("TestBooleanOperations")
 
@@ -1750,9 +1772,16 @@ def test_boolean_body_operations(modeler: Modeler, skip_not_on_linux_service):
     assert Accuracy.length_is_equal(copy1.volume.m, 1)
 
 
-def test_multiple_bodies_boolean_operations(modeler: Modeler, skip_not_on_linux_service):
+def test_multiple_bodies_boolean_operations(modeler: Modeler):
     """Test boolean operations with multiple bodies."""
 
+    # Skip on Linux
+    skip_if_linux(
+        modeler,
+        test_multiple_bodies_boolean_operations.__name__,
+        "copy, translate, intersect, subtract, unite",
+    )
+
     design = modeler.create_design("TestBooleanOperationsMultipleBodies")
 
     comp1 = design.add_component("Comp1")

tests/integration/test_material.py

@@ -27,9 +27,15 @@
 from ansys.geometry.core.materials import Material, MaterialProperty, MaterialPropertyType
 from ansys.geometry.core.misc import UNITS
 
+from .conftest import skip_if_linux
 
-def test_material_creation(modeler: Modeler, skip_not_on_linux_service):
+
+def test_material_creation(modeler: Modeler):
     """Test the creation of a material on a design."""
+
+    # Skip on Linux
+    skip_if_linux(modeler, test_material_creation.__name__, "material.add_property, add_material")
+
     design = modeler.create_design("my_design")
 
     mat_name = "mat_1"

tests/integration/test_plotter.py

@@ -45,6 +45,8 @@
     Triangle,
 )
 
+from .conftest import skip_if_linux
+
 skip_no_xserver = pytest.mark.skipif(
     not system_supports_plotting(), reason="Requires active X Server"
 )
@@ -455,9 +457,12 @@ def test_plot_dummy_gear(verify_image_cache):
 
 
 @skip_no_xserver
-def test_extrude_dummy_gear(modeler: Modeler, verify_image_cache, skip_not_on_linux_service):
+def test_extrude_dummy_gear(modeler: Modeler, verify_image_cache):
     """Test plotting and extrusion of a dummy gear."""
 
+    # Skip on Linux
+    skip_if_linux(modeler, test_extrude_dummy_gear.__name__, "unknown")
+
     # Create a sketch instance
     sketch = Sketch()
 
@@ -499,9 +504,12 @@ def test_plot_spur_gear(verify_image_cache):
 
 
 @skip_no_xserver
-def test_extrude_spur_gear(modeler: Modeler, verify_image_cache, skip_not_on_linux_service):
+def test_extrude_spur_gear(modeler: Modeler, verify_image_cache):
     """Test plotting and extrusion of a spur gear."""
 
+    # Skip on Linux
+    skip_if_linux(modeler, test_extrude_spur_gear.__name__, "unknown")
+
     # Create a sketch instance
     sketch = Sketch()
 

tests/integration/test_tessellation.py

@@ -27,9 +27,15 @@
 from ansys.geometry.core.misc.units import UNITS, Quantity
 from ansys.geometry.core.sketch import Sketch
 
+from .conftest import skip_if_linux
 
-def test_body_tessellate(modeler: Modeler, skip_not_on_linux_service):
+
+def test_body_tessellate(modeler: Modeler):
     """Test the body tessellation."""
+
+    # Skip on Linux
+    skip_if_linux(modeler, test_body_tessellate.__name__, "tessellate")
+
     sketch_1 = Sketch()
     sketch_1.box(Point2D([2, 0], UNITS.m), Quantity(4, UNITS.m), Quantity(4, UNITS.m))
     design = modeler.create_design("Design")
@@ -96,9 +102,12 @@ def test_body_tessellate(modeler: Modeler, skip_not_on_linux_service):
     assert comp_1.bodies[0]._template._tessellation is None
 
 
-def test_component_tessellate(modeler: Modeler, skip_not_on_linux_service):
+def test_component_tessellate(modeler: Modeler):
     """Test the component tessellation."""
 
+    # Skip on Linux
+    skip_if_linux(modeler, test_body_tessellate.__name__, "tessellate")
+
     # Create a sketch
     sketch_1 = Sketch()
     sketch_1.box(Point2D([10, 10], UNITS.m), Quantity(10, UNITS.m), Quantity(5, UNITS.m))