feat: proper service-based testing (#798)

Author: RobPasMue

.github/workflows/ci_cd.yml

@@ -348,7 +348,6 @@ jobs:
       #     ALLOW_PLOTTING: true
       #   with:
       #     python-version: ${{ env.MAIN_PYTHON_VERSION }}
-      #     pytest-extra-args: "--service-os=linux"
       #     checkout: false
 
       - name: Upload integration test logs
@@ -559,7 +558,7 @@ jobs:
           ALLOW_PLOTTING: true
         with:
           python-version: ${{ env.MAIN_PYTHON_VERSION }}
-          pytest-extra-args: "--service-os=linux --use-existing-service=yes"
+          pytest-extra-args: "--use-existing-service=yes"
           checkout: false
           requires-xvfb: true
 

.github/workflows/docker_test_build.yml

@@ -150,7 +150,7 @@ jobs:
           ALLOW_PLOTTING: true
         with:
           python-version: ${{ env.MAIN_PYTHON_VERSION }}
-          pytest-extra-args: "--service-os=linux --use-existing-service=yes"
+          pytest-extra-args: "--use-existing-service=yes"
           checkout: false
           requires-xvfb: true
 

.github/workflows/nightly_docker_test.yml

@@ -128,7 +128,6 @@ jobs:
           ALLOW_PLOTTING: true
         with:
           python-version: ${{ env.MAIN_PYTHON_VERSION }}
-          pytest-extra-args: "--service-os=linux"
           requires-xvfb: true
 
       - name: Stop the Geometry service

tests/conftest.py

@@ -22,26 +22,13 @@ def pytest_addoption(parser):
         choices=("yes", "no"),
     )
 
-    parser.addoption(
-        "--service-os",
-        action="store",
-        default="windows",
-        help="Geometry service OS running. Options: 'windows' or 'linux'. By default, 'windows'.",
-        choices=("windows", "linux"),
-    )
-
 
 @pytest.fixture(scope="session")
 def use_existing_service(request):
     value: str = request.config.getoption("--use-existing-service")
     return True if value.lower() == "yes" else False
 
 
-@pytest.fixture(scope="session")
-def service_os(request):
-    return request.config.getoption("--service-os")
-
-
 @pytest.fixture
 def fake_record():
     def inner_fake_record(

tests/integration/conftest.py

@@ -15,18 +15,13 @@
 import pyvista as pv
 
 from ansys.geometry.core import Modeler
+from ansys.geometry.core.connection.backend import BackendType
 from ansys.geometry.core.connection.defaults import GEOMETRY_SERVICE_DOCKER_IMAGE
 from ansys.geometry.core.connection.local_instance import GeometryContainers, LocalDockerInstance
 
 pv.OFF_SCREEN = True
 
 
-@pytest.fixture(scope="session")
-def skip_not_on_linux_service(service_os: str):
-    if service_os == "linux":
-        return pytest.skip("Implementation not available on Linux service.")  # skip!
-
-
 @pytest.fixture(scope="session")
 def docker_instance(use_existing_service):
     # This will only have a value in case that:
@@ -121,3 +116,9 @@ 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

@@ -774,7 +774,7 @@ def test_bodies_translation(modeler: Modeler):
     )
 
 
-def test_download_file(modeler: Modeler, tmp_path_factory: pytest.TempPathFactory, service_os: str):
+def test_download_file(modeler: Modeler, tmp_path_factory: pytest.TempPathFactory):
     """Test for downloading a design in multiple modes and verifying the correct
     download."""
 
@@ -803,8 +803,8 @@ def test_download_file(modeler: Modeler, tmp_path_factory: pytest.TempPathFactor
 
     design.save(file_location=file_save)
 
-    # Check for other exports
-    if service_os == "windows":
+    # Check for other exports - Windows backend...
+    if modeler.client.backend_type != BackendType.LINUX_SERVICE:
         binary_parasolid_file = tmp_path_factory.mktemp("scdoc_files_download") / "cylinder.x_b"
         text_parasolid_file = tmp_path_factory.mktemp("scdoc_files_download") / "cylinder.x_t"
 
@@ -825,11 +825,10 @@ def test_download_file(modeler: Modeler, tmp_path_factory: pytest.TempPathFactor
         # design.download(pmdb_file, DesignFileFormat.PMDB)
         # assert pmdb_file.exists()
 
-    elif service_os == "linux":
+    # Linux backend...
+    else:
         binary_parasolid_file = tmp_path_factory.mktemp("scdoc_files_download") / "cylinder.xmt_bin"
         text_parasolid_file = tmp_path_factory.mktemp("scdoc_files_download") / "cylinder.xmt_txt"
-    else:
-        raise Exception("Unable to determine the service operating system.")
 
     fmd_file = tmp_path_factory.mktemp("scdoc_files_download") / "cylinder.fmd"
 

tests/integration/test_design_import.py

@@ -5,6 +5,7 @@
 import pytest
 
 from ansys.geometry.core import Modeler
+from ansys.geometry.core.connection.backend import BackendType
 from ansys.geometry.core.designer import Component, Design
 from ansys.geometry.core.designer.design import DesignFileFormat
 from ansys.geometry.core.math import Plane, Point2D, Point3D, UnitVector3D, Vector3D
@@ -101,7 +102,7 @@ def test_design_import_simple_case(modeler: Modeler):
     _checker_method(read_design, design)
 
 
-def test_open_file(modeler: Modeler, tmp_path_factory: pytest.TempPathFactory, service_os: str):
+def test_open_file(modeler: Modeler, tmp_path_factory: pytest.TempPathFactory):
     """Test creation of a component, saving it to a file, and loading it again to a
     second component and make sure they have the same properties."""
 
@@ -152,7 +153,7 @@ def test_open_file(modeler: Modeler, tmp_path_factory: pytest.TempPathFactory, s
     _checker_method(design, design2, True)
 
     # Test HOOPS formats (Windows only)
-    if service_os == "windows":
+    if modeler.client.backend_type != BackendType.LINUX_SERVICE:
         # STEP
         file = tmp_path_factory.mktemp("test_design_import") / "two_cars.step"
         design.download(file, DesignFileFormat.STEP)